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

mrzhssss

2022-06-07 1d997b9fd1cc2627a1313be762a76cc7cd37fabe

 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-请先组托";

}