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

18516761980

2022-06-15 15dc5e53f4ba7fe72cc0f3d3a246a9599fa52acf

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

@@ -10,5 +10,6 @@
    String USER_10003 = "10003-密码错误";

    String PICK_600 = "600-拣料任务";
    String NO_COMB_700 = "700-请先组托";

}