Преглед изворни кода

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

anderx пре 2 година
родитељ
комит
cede476b81

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -383,6 +383,9 @@
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER}
 	</if>
+    <if test="type == 1">
+      and a.status=1
+    </if>
 
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}
@@ -430,6 +433,9 @@
 	<if test="type !=null">
 	and a.`type`= #{type,jdbcType=INTEGER}
 	</if>
+    <if test="type == 1">
+      and a.status=1
+    </if>
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>

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

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.77
+static.host=//static.jishutao.com/1.2.78
 rd.static.host=//static.jishutao.com/RD/1.0.01
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

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

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.77
+static.host=//static.jishutao.com/1.2.78
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload