From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/CheckStandard.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
index 5469a0c..6fddff1 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
@@ -56,31 +56,31 @@
private String operaSymbol;
@Column(name = "UPPER_LIMIT_")
- @PropertyDef(label = "鏍囧噯涓婇檺")
+ @PropertyDef(label = "鏍囧噯鍊�")
private Double upperLimit;
@Column(name = "RULE_NUM_")
- @PropertyDef(label = "鎵ｉ噸绯绘暟")
+ @PropertyDef(label = "澧炴墸閲嶇郴鏁�")
private Double ruleNum;
+ @Column(name = "RULE_REDUCE_")
+ @PropertyDef(label = "鎵ｉ噸姣斾緥")
+ private Double ruleReduce;
+
@Column(name = "RULE_ADD_")
- @PropertyDef(label = "澧為噸%")
+ @PropertyDef(label = "澧為噸姣斾緥")
private Double ruleAdd;
@Column(name = "RULE_ADD_END_")
@PropertyDef(label = "澧為噸涓婇檺%")
private Double ruleAddEnd;
- @Column(name = "RULE_REDUCE_")
- @PropertyDef(label = "鎵ｉ噸%")
- private Double ruleReduce;
-
@Column(name = "RULE_PRICE_")
@PropertyDef(label = "鎵ｈ垂绯绘暟")
private Double rulePrice;
@Column(name = "RULE_REDUCE_PRICE_")
- @PropertyDef(label = "鎵ｈ垂")
+ @PropertyDef(label = "鎵ｈ垂姣斾緥")
private Double ruleReducePrice;
@Column(name = "UPDATE_TIME_")
--
Gitblit v1.9.3