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

jinpengyong

2023-10-10 f0837ee21f7650d4413830d4ee90da02bcdd6d36

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

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

    /**
     * 目标单位键