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

Junjie

2023-12-13 d02a6b2cf6f0030456fd7ea568570f3df0dd7291

 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();