Browse Source

Merge branch 'test2' of jishutao/kede-server into prod

anderx 1 year ago
parent
commit
d3f6f74dd0

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1069,7 +1069,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           (1)
           (1)
         </if>
         </if>
         <if test="manageType ==1">
         <if test="manageType ==1">
-          (5)
+          (4)
         </if>
         </if>
       </if>
       </if>
       <if test="approval ==2">
       <if test="approval ==2">
@@ -1078,7 +1078,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
           (2,3)
           (2,3)
         </if>
         </if>
         <if test="manageType ==1">
         <if test="manageType ==1">
-          (6,7)
+          (5,6)
         </if>
         </if>
 
 
       </if>
       </if>

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
 
-static.host=//static.jishutao.com/1.3.17
-#static.host=//172.16.1.187/1.3.17
+static.host=//static.jishutao.com/1.3.18
+#static.host=//172.16.1.187/1.3.18
 
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
 dev.name=test
-static.host=//static.jishutao.com/1.3.17
+static.host=//static.jishutao.com/1.3.18
 #Driver
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false