Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

18516761980

2022-08-18 9a6a85eecf1dd8489de45eb3ab804d3e33605be2

 src/main/java/com/zy/common/entity/Parameter.java

@@ -63,4 +63,9 @@
    // erp上报
    private String erpReport;

    /**
     * 查找库位规则[0:默认,1:按设备,2：按通道]
     */
    private String findLocRule;

}