Merge remote-tracking branch 'origin/jkasrs' into jkasrs

mrzhssss

2022-05-27 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be

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

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

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

}