Bläddra i källkod

Merge branch 'test' of
ssh://git@git.jishutao.com:55555/jishutao/jitao-server.git into test

Conflicts:
src/main/resources/props/config_local.properties

limin 7 år sedan
förälder
incheckning
e07459ec02

+ 0 - 3
src/main/java/com/goafanti/business/controller/UserJtBusinessController.java

@@ -132,9 +132,6 @@ public class UserJtBusinessController extends CertifyApiController{
 		if(StringUtils.isNotBlank(jtBusinessProject.getApplyConditions()) && jtBusinessProject.getApplyConditions().length() > 512){
 			result.getError().add(buildError("512", "项目客户条件字数不能超过512"));
 		}
-		if(StringUtils.isNotBlank(jtBusinessProject.getIntroduce()) && jtBusinessProject.getIntroduce().length() > 2048){
-			result.getError().add(buildError("2048", "项目服务内容字数不能超过2048"));
-		}
 		if(result.getError().size()>0) {
 			return result;
 		}

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

@@ -56,7 +56,9 @@ app.mobile.website=http://m.kedexinxi.com
 template.cacheable=false
 
 static.host=//sclient.jishutao.com:8088/client/1.0.0
+
 portal.host=//sportal.jishutao.com:80/portal/1.0.0
+
 avatar.host=//sclient.jishutao.com
 avatar.upload.host=//sclient.jishutao.com/upload