From 22a51a35a7367bc5569ea075afe0b7f1c438b529 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 11:10:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/common/entity/Parameter.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index 91e7c65..32a1ae1 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -6,6 +6,7 @@
import com.zy.system.service.ConfigService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import lombok.Data;
import java.util.HashMap;
import java.util.List;
@@ -14,6 +15,7 @@
/**
* 鍩虹閰嶇疆涓績銆傚彲閫氳繃鍒锋柊鎸囧畾鎺ュ彛鍒锋柊鐩稿叧閰嶇疆
*/
+@Data
public class Parameter {
private volatile static Parameter instance = null;
@@ -52,22 +54,16 @@
// 楠岃瘉鐮佸紑鍏�
private String codeSwitch;
- public String getCodeSwitch() {
- return codeSwitch;
- }
-
- public void setCodeSwitch(String codeSwitch) {
- this.codeSwitch = codeSwitch;
- }
-
// 搴撲綅鍒濆鍖栧彛浠�
private String locMastInitPwd;
- public String getLocMastInitPwd() {
- return locMastInitPwd;
- }
+ // 鎵撳寘涓嬬嚎
+ private String packDown;
- public void setLocMastInitPwd(String locMastInitPwd) {
- this.locMastInitPwd = locMastInitPwd;
- }
+ // erp涓婃姤
+ private String erpReport;
+
+ //鏈烘鑷傝嚜鍔ㄨˉ璐у紑鍏�
+ private String autoReplenishment;
+
}
--
Gitblit v1.9.1