java/HongRuiTang.git

			@@ -19,6 +19,9 @@
			@ApiModelProperty(value = "商户id")
			private Long shopId;

			@ApiModelProperty(value="商户编号")
			private String shopNumber;

			@ApiModelProperty(value="商户名称")
			private String shopName;

			@@ -37,8 +40,17 @@
			@ApiModelProperty(value="店主联系方式")
			private String shopownerPhone;

			@ApiModelProperty(value="签约省区域")
			private String signProvinceCode;

			@ApiModelProperty(value="签约市区域")
			private String signCityCode;

			@ApiModelProperty(value="签约区域")
			private String signAreaCode;

			@ApiModelProperty(value="签约区域全称")
			private String signAreaName;

			@ApiModelProperty(value="商户服务电话")
			private String shopServicePhone;
			@@ -46,8 +58,14 @@
			@ApiModelProperty(value="管辖员工")
			private Long belongUserId;

			@ApiModelProperty(value="管辖员工")
			private String belongUserName;

			@ApiModelProperty(value="所属经销商")
			private Long belongShopId;

			@ApiModelProperty(value="所属经销商")
			private String belongShopName;

			@ApiModelProperty(value="扶持能力1.有2.没有")
			private Integer supportingCapacityFlag;
			@@ -106,6 +124,9 @@
			@ApiModelProperty(value="生日卡1开2关")
			private Integer platformBirthdayFlag;

			@ApiModelProperty(value="抽奖1开2关")
			private Integer lotteryDrawFlag;

			@ApiModelProperty(value="推荐人")
			private String recommendPerson;

			@@ -115,8 +136,12 @@
			@ApiModelProperty(value="商户标签")
			private String shopTags;


			@ApiModelProperty(value="关联用户id 多个用,隔开")
			private String relUserIds;

			@ApiModelProperty(value="默认登录账号-开启的用户id集合")
			private String relUserOpenIds;

			@ApiModelProperty(value="关联用户")
			private String relUsers;
			@@ -130,7 +155,11 @@
			@ApiModelProperty(value="证书list")
			private List<ShopCertificate> shopCertificateList;

			@ApiModelProperty(value="小鹅通讲师id 多个用,隔开")
			private String xiaoeUserId;

			@ApiModelProperty("修改价格权限（0=关，1=开）")
			private Integer modifyPricePermission;