Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-07-10 6344a8b6b7e2853dbfa9e6506ff2e17a31930297

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

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


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

}