diff --git a/mallplus-admin/pom.xml b/mallplus-admin/pom.xml
index 3d8e5ac..cf53347 100644
--- a/mallplus-admin/pom.xml
+++ b/mallplus-admin/pom.xml
@@ -62,11 +62,11 @@
gecco
1.0.8
-
+
com.alibaba
fastjson
- 1.2.59
+ 1.2.62
commons-io
diff --git a/mallplus-admin/src/main/resources/application-dev.properties b/mallplus-admin/src/main/resources/application-dev.properties
index 225d647..7f32296 100644
--- a/mallplus-admin/src/main/resources/application-dev.properties
+++ b/mallplus-admin/src/main/resources/application-dev.properties
@@ -18,11 +18,11 @@ spring.redis.pool.min-idle=0
# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
spring.redis.timeout=0
#===redis end===
-#spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://8.130.39.13:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/mallplus1?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&useTimezone=true&serverTimezone=GMT%2B8
spring.datasource.username=root
-spring.datasource.password=root
-#spring.datasource.password=1LAiGz$t1*Iw
+#spring.datasource.password=root
+spring.datasource.password=1LAiGz$t1*Iw
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
spring.datasource.druid.initialSize=5
diff --git a/mallplus-mbg/pom.xml b/mallplus-mbg/pom.xml
index 8a4e7de..0f55de4 100644
--- a/mallplus-mbg/pom.xml
+++ b/mallplus-mbg/pom.xml
@@ -18,7 +18,8 @@
3.0-RC3
3.2.0
3.1.0
- [4.1.12,)
+
+ 5.0.4
[7.2.0, 7.2.99]
1.4.7
3.9.1
@@ -113,12 +114,12 @@
io.springfox
springfox-swagger2
- 2.6.1
+ 2.7.0
io.springfox
springfox-swagger-ui
- 2.6.1
+ 2.7.0
@@ -142,10 +143,12 @@
3.2.1
compile
+
+
cn.afterturn
easypoi-annotation
- 4.0.0
+ 3.2.0
compile
diff --git a/mallplus-portal/pom.xml b/mallplus-portal/pom.xml
index 1b5a753..af4b03e 100644
--- a/mallplus-portal/pom.xml
+++ b/mallplus-portal/pom.xml
@@ -77,7 +77,7 @@
com.alibaba
fastjson
- 1.2.60
+ 1.2.62
commons-logging
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
index 3c46ec2..7105811 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/single/SingePmsController.java
@@ -385,7 +385,8 @@ public class SingePmsController extends ApiBaseAction {
if (ValidatorUtils.notEmpty(schoolId) && schoolId > 0) {
product.setSchoolId(schoolId);
}
- String orderColum = "create_time";
+ // String orderColum = "create_time";
+ String orderColum = "sort";
if (ValidatorUtils.notEmpty(product.getSort())) {
if (product.getSort() == 1) {
orderColum = "sale";
diff --git a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
index 0cf6746..83bc00b 100644
--- a/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
+++ b/mallplusui-web-admin/src/views/pms/product/components/ProductInfoDetail.vue
@@ -119,9 +119,9 @@
-->
-
+
下一步