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

cjl

2023-07-28 6fe3e9841f25481cf78bd1f102886d4ce35e9e17

 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;
    }

}