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

Junjie

2023-12-25 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a

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

@@ -13,4 +13,6 @@
    String PICK_600 = "600-拣料任务";
    String NO_COMB_700 = "700-请先组托";

    String USER_10004 = "10004-账号或密码错误";

}