Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-27 54c0125835e850b97793601ac45ee62fa1c4b12e

 screen-api/src/main/java/com/moral/api/entity/HistoryDaily.java

@@ -37,9 +37,4 @@
    private String value;


    @Override
    protected Serializable pkVal() {
        return null;
    }

}