Browse Source

Merge branch 'test02' into test

# Conflicts:
#	src/main/resources/props/config_local.properties
anderx 2 years ago
parent
commit
b4c4dbd20d

+ 1 - 1
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -68,7 +68,7 @@ public class OrderListBo {
 	private String finalReceivablesTime;
 	@Excel(name="结算状态",readConverterExp = "0=首付待付请,1=尾款待付清,2=已付请,3=部分退款,4=全部退款")
 	private Integer liquidationStatus;
-	@Excel(name="订单流程",readConverterExp = "0=已派营销员,1=已派营销员管理员,2=已派财务管理员,3=已派财务专员,4=已派咨询师管理员,5=已部分派咨询师经理,6=已部全部派咨询师经理")
+	@Excel(name="订单流程",enumsName = "com.goafanti.order.enums.ProcessStatus")
 	private Integer processStatus;
 	@Excel(name="是否特批" ,readConverterExp = "0=非特批,1=待审核,2=通过,3=驳回")
 	private Integer approval;

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

@@ -52,8 +52,8 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.81
-rd.static.host=//static.jishutao.com/RD/1.0.01
+static.host=//static.jishutao.com/1.2.72
+rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
 #static.host=//172.16.1.187/1.2.81