Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 8b52cb78c70877c9d8689bfcdb49461995cf939a

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -42,7 +42,6 @@
        locDetl.setSize(matCode.getSize()); // 尺寸
        locDetl.setColor(matCode.getColor()); // 颜色
        locDetl.setWeight(matCode.getWeight()); // 单重
        locDetl.setStr3(matCode.getStr3());
    }

    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {