合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

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