Parcourir la source

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

anderx il y a 3 ans
Parent
commit
4d415400e3

+ 1 - 1
src/main/java/com/goafanti/evaluation/bo/Step1.java

@@ -32,7 +32,7 @@ public class Step1 {
 	private String	currencyType;
 
 	@NotNull
-	@Pattern(regexp = "\\d{4}-\\d{2}-01")
+	@Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}")
 	private String	benchmarkDate;
 
 	public String getName() {

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

@@ -38,7 +38,7 @@ app.name=AFT
 app.mobile.website=http://m.jishutao.com/1.0/template/index.html
 template.cacheable=false
 
-static.host=//ss.jishutao.com/client/1.2.10
+static.host=//ss.jishutao.com/client/1.2.11
 portal.host=//ss.jishutao.com/portal/1.2.17
 skjt.host=//ss.jishutao.com/skjt/1.3