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

野心家

2023-09-01 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0

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

@@ -60,4 +60,12 @@
    // 打包下线
    private String packDown;

    // erp上报
    private String erpReport;

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

}