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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

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

@@ -33,7 +33,7 @@
    /**
     * 原始单位键
     */
    private String originalUnitKey;
    private Integer originalUnitKey;

    /**
     * 目标单位键
@@ -64,11 +64,5 @@
     * 是否删除
     */
    private String isDelete;


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

}