Browse Source

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

anderx 3 years ago
parent
commit
f79cea796d

+ 2 - 2
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -19,13 +19,13 @@ public class OutPublicDtails  {
 	private String assistAidName;
 	@Excel(name = "公出时长",width = 8)
 	private String duration;
-	@Excel(name = "状态" ,readConverterExp = "0=驳回,1=待审核,2=同意,3=撤销",width = 8)
+	@Excel(name = "状态" ,readConverterExp = "0=驳回,1=待审核,2=同意,3=撤销,4=技术驳回",width = 8)
 	private Integer status;
 	@Excel(name = "公出开始时间")
 	private String releaseStarts;
 	@Excel(name = "公出结束时间")
 	private String releaseEnds;
-	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡",width = 8)
+	@Excel(name = "打卡状态",readConverterExp = "0=未打卡,1=已打卡,2=异常打卡",width = 8)
 	private Integer clockIn;
 	@Excel(name = "打卡时间" )
 	private String clockInTimes;

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

@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.23
+static.host=//static.jishutao.com/1.2.24
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.05
 #static.host=http://172.16.1.187/prod/1.2.05

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

@@ -43,7 +43,7 @@ user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.23
+static.host=//static.jishutao.com/1.2.24
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload