Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-30 373c036205c6d8ac3871857da7b3c7a44e384086

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

@@ -72,9 +72,4 @@
    private String isDelete;


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

}