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

tzsk

昨天 9b36259270078e99c7665a818fff90bbcde8ef7d

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

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

    // erp上报
    private String erpReport;

    //机械臂自动补货开关
    private String autoReplenishment;

}