Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2

zjj

2024-09-03 e1c7f150792a5085dd64e86e6af82820ab34dc05

 src/main/java/com/zy/asrs/service/LocRuleService.java

@@ -10,6 +10,8 @@

    List<LocRule> find(String matnr);

    List<LocRule> findCode(String matnr, String other);

    //找混载库位规则
    List<LocRule> findMixed();