diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
index a1c7363..71c2044 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
@@ -60,6 +60,9 @@
@ExcelProperty("页面价格")
@TableField("price")
private String price;
+ @ExcelProperty("控制价格")
+ @TableField(exist = false)
+ private String oldPrice;
/**
* 0 页面无效 1 价格偏高
*/
@@ -85,9 +88,7 @@
@TableField(exist = false)
private String skuUrl;
- @ExcelProperty("控制价格")
- @TableField(exist = false)
- private String oldPrice;
+
@Override
public String toString() {
return "ProductInfo{" +
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
index a1c7363..71c2044 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
@@ -60,6 +60,9 @@
@ExcelProperty("页面价格")
@TableField("price")
private String price;
+ @ExcelProperty("控制价格")
+ @TableField(exist = false)
+ private String oldPrice;
/**
* 0 页面无效 1 价格偏高
*/
@@ -85,9 +88,7 @@
@TableField(exist = false)
private String skuUrl;
- @ExcelProperty("控制价格")
- @TableField(exist = false)
- private String oldPrice;
+
@Override
public String toString() {
return "ProductInfo{" +
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index ea45d78..068b3d6 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -103,18 +103,17 @@
mysql-connector-java
${mysql.driver.version}
-
-
- com.casic
- casic-area-starter
- ${admin.version}
-
com.casic
casic-server
${pro.version}
+
+ com.casic
+ casic-area-starter
+ ${admin.version}
+
@@ -168,8 +167,14 @@
${maven.war.plugin.version}
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.6
+
+
cn.smallbun.screw
screw-maven-plugin
+ ${screw.version}
com.spotify
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
index a1c7363..71c2044 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/model/ProductInfo.java
@@ -60,6 +60,9 @@
@ExcelProperty("页面价格")
@TableField("price")
private String price;
+ @ExcelProperty("控制价格")
+ @TableField(exist = false)
+ private String oldPrice;
/**
* 0 页面无效 1 价格偏高
*/
@@ -85,9 +88,7 @@
@TableField(exist = false)
private String skuUrl;
- @ExcelProperty("控制价格")
- @TableField(exist = false)
- private String oldPrice;
+
@Override
public String toString() {
return "ProductInfo{" +
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index ea45d78..068b3d6 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -103,18 +103,17 @@
mysql-connector-java
${mysql.driver.version}
-
-
- com.casic
- casic-area-starter
- ${admin.version}
-
com.casic
casic-server
${pro.version}
+
+ com.casic
+ casic-area-starter
+ ${admin.version}
+
@@ -168,8 +167,14 @@
${maven.war.plugin.version}
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.6
+
+
cn.smallbun.screw
screw-maven-plugin
+ ${screw.version}
com.spotify
diff --git a/casic-web/src/main/resources/db/migration/V1.0__init_database.sql b/casic-web/src/main/resources/db/migration/V1.0__init_database.sql
index 83f2d8d..1099a5d 100644
--- a/casic-web/src/main/resources/db/migration/V1.0__init_database.sql
+++ b/casic-web/src/main/resources/db/migration/V1.0__init_database.sql
@@ -705,7 +705,7 @@
-- ----------------------------
-- Records of sys_user
-- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 'girl.gif', 'admin', '270fa3ef938fb1277d1ab23e9971566a', 'jg8q8', '超级管理员', '2017-05-04 16:00:00', '1', 'sn93@qq.com', '18200000000', '1,1398227452970446850', 0, '1', 25, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, '2022-05-23 10:57:45', NULL, NULL, '2016-01-29 00:49:53', NULL, '0', NULL);
+INSERT INTO `sys_user` VALUES (1, 'girl.gif', 'admin', '270fa3ef938fb1277d1ab23e9971566a', 'jg8q8', '超级管理员', '2017-05-04 16:00:00', '1', 'sn93@qq.com', '18200000000', '1,1398227452970446850', 24, '1', 25, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, '2022-05-23 10:57:45', NULL, NULL, '2016-01-29 00:49:53', NULL, '0', NULL);
INSERT INTO `sys_user` VALUES (1398227662819864577, NULL, 'yxjc', '765c9be598b4b9e2bf420369940f2cff', 'vznm9', '运行监测管理员', '2021-05-27 16:00:00', '1', NULL, NULL, '1398227452970446850', 24, '1', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, '2021-06-04 07:20:44', NULL, 1, '2021-05-28 10:40:27', '2021-09-13 13:36:08', '0', NULL);
INSERT INTO `sys_user` VALUES (1432263995607232513, NULL, 'test001', '2500cb733d0aaabd475d211c55942d8c', 'tbl2c', '测试用户1', '1988-11-25 16:00:00', '1', '472853529@qq.com', '18600202639', NULL, 24, '1', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, '2021-08-30 08:48:41', 1, NULL, '2021-08-30 08:48:41', NULL, '0', NULL);
INSERT INTO `sys_user` VALUES (1455378140255043585, NULL, '测试', '6c089e9ff40b2b8b567ff4d6c40cc20a', '34a9g', 'yxw', '2021-10-31 16:00:00', '0', '', '', '[\"1398227452970446850\"]', 1429999819396530178, '1', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, '2021-11-02 03:36:07', 1, NULL, '2021-11-02 03:36:03', NULL, '0', NULL);