Merge branch 'dsc' into 'develop'

改省市区id为字符串

See merge request 8timerv2/8timerapiv200!207

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -94,20 +94,20 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="籍贯 省",example="101")
     private String jg;
 	@ApiModelProperty(value="籍贯 省id",example="101")
-    private Integer jgId;
+    private String jgId;
     
 	@ApiModelProperty(value = "省")
 	private String province;
 	@ApiModelProperty(value = "省id")
-	private Integer provinceId;
+	private String provinceId;
 	@ApiModelProperty(value = "市")
 	private String city;
-	@ApiModelProperty(value = "市")
-	private Integer cityId;
+	@ApiModelProperty(value = "市id")
+	private String cityId;
 	@ApiModelProperty(value = "区")
 	private String district;
 	@ApiModelProperty(value = "区编号")
-	private Integer districtId;
+	private String districtId;
     
 	@ApiModelProperty(value="户口性质 1:城镇户口;2:农村户口;3:居民户口",example="101")
     private Integer hkType;