Kaynağa Gözat

Accept Merge Request #223 合并线上版本到开发版本 : (prod -> master)

Merge Request: 合并线上版本到开发版本
Created By: @albertshaw
Accepted By: @albertshaw
URL: https://coding.net/t/aft/p/AFT/git/merge/223
albertshaw 8 yıl önce
ebeveyn
işleme
b3fd69e371

+ 0 - 2
schema/20170821-demand.sql

@@ -1,2 +0,0 @@
-ALTER TABLE `demand` 
-CHANGE COLUMN `problem_des` `problem_des` LONGTEXT NULL DEFAULT NULL COMMENT '问题说明' ;

+ 1 - 1
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -1395,7 +1395,7 @@
 	where 
 		jmrh_flag = 1 and data_category = 0
 	order by 
-			create_time desc
+		create_time desc
 	limit 5;
   </select>
   <select id="selectJmrTechnology" resultType="com.goafanti.residentIntegration.bo.ResidentIntegrationBo">

+ 1 - 0
src/main/java/com/goafanti/common/model/Achievement.java

@@ -742,6 +742,7 @@ public class Achievement {
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getJmrhFlag() {
 		return jmrhFlag;
+		
 	}
 
 	public void setJmrhFlag(Integer jmrhFlag) {

+ 1 - 1
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -48,7 +48,7 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		demandType;
 
-	@Size(min = 0, max = 500, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
+	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		problemDes;
 
 	@Size(min = 0, max = 256, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")

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

@@ -69,7 +69,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//sf.jishutao.com/portal/1.0.10
+portal.host=//sf.jishutao.com/portal/1.0.9
 
 patentTemplate=SMS_72005286