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

jinpengyong

2023-09-22 e8242c8c4b69a52bd49fd0b5b49333e1d227e405

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

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

    /**
     * 目标单位键