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

cjl

2024-03-28 33b9d2c203a9998272088ecdf43a15dd53669967

 screen-manage/src/main/java/com/moral/api/entity/Test.java

@@ -44,9 +44,4 @@
    private String mobile;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}