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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

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

}