Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java

@@ -58,8 +58,8 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="电话号码 ",example="18712345678")
     private String phone;
 	
-	@ApiModelProperty(value="所在地区",example="440111")
-    private Integer area;
+	@ApiModelProperty(value="所在地区",example="广东省广州市白云区")
+    private String area;
     
 	@ApiModelProperty(value="办公地址 ",example="广从一路5号柏曼酒店3楼")
     private String workAddress;