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

野心家

2023-08-29 4dc17f30c7ac7ad17a52a8bc313e03928500369e

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

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

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

}