Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -242,7 +242,7 @@ public class AppPermissionService {
                     appUserLoginBiz.updateSelectiveById(userLogin);
                 }
                 data.put("im_token",access_token);
-                data.put("im_UserId",imUserId);
+                data.put("im_userId",imUserId);
             }
 
             if (data != null) {

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSiteDTO.java

@@ -31,7 +31,7 @@ public class GoodSiteDTO {
 
     //分公司id
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java

@@ -50,7 +50,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "company_id")
 	@ApiModelProperty(value = "分公司id")
-	private String companyId;
+	private Integer companyId;
 
 	/**
 	 * 地址-省/直辖市(编码)
@@ -64,7 +64,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "province_name")
 	@ApiModelProperty("地址-省/直辖市(名称)")
-	private Integer provinceName;
+	private String provinceName;
 
 	/**
 	 * 地址-市(编码)
@@ -78,7 +78,7 @@ public class TourGoodSite implements Serializable {
 	 */
 	@Column(name = "city_name")
 	@ApiModelProperty("地址-市(名称)")
-	private Integer cityName;
+	private String cityName;
 
 	/**
 	 *	出发时间