diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 24aea0d..b7a2430 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
compile
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 24aea0d..b7a2430 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index e0f1310..3f682e0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 24aea0d..b7a2430 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index e0f1310..3f682e0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index b98b2d3..bd09129 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-common
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 24aea0d..b7a2430 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index e0f1310..3f682e0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index b98b2d3..bd09129 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-common
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
index 240eeb8..1259cc0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
@@ -168,7 +168,7 @@
return null;
case LOW_POWER:
return null;
- case LOW_FREQUENCY_SIGNAL_GENERATOR:
+ case LOW_FREQUENCY_SIGNAL_SOURCE:
return null;
case S_PARAM:
return null;
@@ -213,7 +213,7 @@
return null;
case LOW_POWER:
return null;
- case LOW_FREQUENCY_SIGNAL_GENERATOR:
+ case LOW_FREQUENCY_SIGNAL_SOURCE:
return null;
case S_PARAM:
return null;
diff --git a/casic-metering-api/pom.xml b/casic-metering-api/pom.xml
index c895bc6..3dc3226 100644
--- a/casic-metering-api/pom.xml
+++ b/casic-metering-api/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -18,13 +18,13 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
com.casic
casic-metering-job
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
index 1f5ca70..b1eaec9 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/resource/ResourceSystemFileController.java
@@ -54,7 +54,6 @@
@ApiOperation("体系文件/历史文件编辑")
@PostMapping("/update")
public ReturnDTO fileUpdate(@RequestBody @Valid BizResourceSystemFile systemFile) {
-
return systemFileService.fileUpdate(systemFile);
}
diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml
index 38830a2..01b56aa 100644
--- a/casic-metering-common/pom.xml
+++ b/casic-metering-common/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -17,12 +17,12 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.github.oshi
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
index 5b400f1..a68e349 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/business/MeasureItemBelongStandardEquipmentDictEnum.java
@@ -81,9 +81,9 @@
String LOW_POWER = "15";
/**
- * 低频信号发生器标准装置
+ * 低频信号源检定装置
*/
- String LOW_FREQUENCY_SIGNAL_GENERATOR = "16";
+ String LOW_FREQUENCY_SIGNAL_SOURCE = "16";
/**
* S参数标准装置
diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml
index feab2ac..413734e 100644
--- a/casic-metering-dao/pom.xml
+++ b/casic-metering-dao/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,7 +16,7 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml
index 24aea0d..b7a2430 100644
--- a/casic-metering-job/pom.xml
+++ b/casic-metering-job/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -14,12 +14,12 @@
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.github.oshi
@@ -61,7 +61,7 @@
com.casic
casic-metering-service
- 1.1.0
+ 1.2.0
compile
diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml
index e0f1310..3f682e0 100644
--- a/casic-metering-model/pom.xml
+++ b/casic-metering-model/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml
index b98b2d3..bd09129 100644
--- a/casic-metering-service/pom.xml
+++ b/casic-metering-service/pom.xml
@@ -5,7 +5,7 @@
casic-metering-biz-xichang
com.casic
- 1.1.0
+ 1.2.0
4.0.0
@@ -16,19 +16,19 @@
com.casic
casic-metering-dao
- 1.1.0
+ 1.2.0
com.casic
casic-metering-model
- 1.1.0
+ 1.2.0
com.casic
casic-metering-common
- 1.1.0
+ 1.2.0
org.springframework.boot
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
index 240eeb8..1259cc0 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureItemInfoServiceImpl.java
@@ -168,7 +168,7 @@
return null;
case LOW_POWER:
return null;
- case LOW_FREQUENCY_SIGNAL_GENERATOR:
+ case LOW_FREQUENCY_SIGNAL_SOURCE:
return null;
case S_PARAM:
return null;
@@ -213,7 +213,7 @@
return null;
case LOW_POWER:
return null;
- case LOW_FREQUENCY_SIGNAL_GENERATOR:
+ case LOW_FREQUENCY_SIGNAL_SOURCE:
return null;
case S_PARAM:
return null;
diff --git a/pom.xml b/pom.xml
index c30b184..3b9a484 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.casic
casic-metering-biz-xichang
- 1.1.0
+ 1.2.0
casic-metering
pom