Merge branch 'dsc' into 'develop'

客户跟进内容类型更正

See merge request 8timerv2/8timerapiv200!173

src/main/java/cn/timer/api/bean/crm/CrmClientFollow.java

@@ -57,7 +57,7 @@ public class CrmClientFollow extends Model<CrmClientFollow> {
 	private Integer cid;
 	private Integer cid;
 
 
 	@ApiModelProperty(value = "跟进内容")
 	@ApiModelProperty(value = "跟进内容")
-	private Integer content;
+	private String content;
 	
 	
 	@ApiModelProperty(value = "客户数据状态 0-无 1-潜在 2-意向 3-签约 4-合作中 5-已封档")
 	@ApiModelProperty(value = "客户数据状态 0-无 1-潜在 2-意向 3-签约 4-合作中 5-已封档")
 	private Integer clientStatus;
 	private Integer clientStatus;