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

18516761980

2022-07-20 ea3f1ee47f365b2958cb9f6e1b93d7dde7496ba2

 src/main/java/com/zy/common/CodeRes.java

@@ -9,6 +9,8 @@
    String USER_10002 = "10002-账号已被禁用";
    String USER_10003 = "10003-密码错误";

    String EXIST_500 = "500-工作档/库存条码数据已存在";
    String PICK_600 = "600-拣料任务";
    String NO_COMB_700 = "700-请先组托";

}