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

LSH

2023-12-27 2632e1b05c4f68cc49b9acb3b3a8847cc0ed86e2

 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-账号或密码错误";

}