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

jinpengyong

2022-03-09 5fa4c1db3141099be4ca176cdf2f3ec10f46c141

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

@@ -65,10 +65,4 @@
     */
    private String isDelete;


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

}