productDev/zbomyoujia.git

			@@ -90,7 +90,7 @@
			@ExcelColumn(name="微信openid")
			private String openid;

			@ApiModelProperty(value = "账户状态 0停用，1启用", example = "1")
			@ApiModelProperty(value = "账户状态 0停用，1启用，-1删除", example = "1")
			@ExcelColumn(name="账户状态 0停用，1启用")
			private String status;

			@@ -134,8 +134,8 @@
			@ExcelColumn(name="服务客户数")
			private Integer costomerNum;

			@ApiModelProperty(value = "从业年月(yyyy-MM)")
			@ExcelColumn(name="从业年月(yyyy-MM)")
			@ApiModelProperty(value = "从业年份")
			@ExcelColumn(name="从业年月")
			private String jobDate;

			@ApiModelProperty(value = "宣传语")
			@@ -146,9 +146,24 @@
			@ExcelColumn(name="个人二维码图片地址")
			private String qrcodeImg;

			@ApiModelProperty(value = "企业二维码图片地址")
			@ExcelColumn(name="企业二维码图片地址")
			private String companyQrcodeImg;

			@ApiModelProperty(value = "中台临时票据过期时间")
			@ExcelColumn(name="中台临时票据过期时间")
			private Date tokenDate;

			@ApiModelProperty(value = "中台临时票据")
			@ExcelColumn(name="中台临时票据")
			private String token;

			@ApiModelProperty(value = "邮箱")
			@ExcelColumn(name="邮箱")
			private String email;
			@ApiModelProperty(value = "名片")
			@ExcelColumn(name="名片")
			private String cardImg;

			@ApiModelProperty(value = "用户类型，区分HR内部员工和加盟商员工，10001加盟商，10002HR内部员工，多个使用英文逗号隔开")
			@ExcelColumn(name="用户类型，区分HR内部员工和加盟商员工，10001加盟商，10002HR内部员工，多个使用英文逗号隔开")
			@@ -158,9 +173,12 @@
			@ExcelColumn(name="用户角色编码集合，多个用英语逗号隔开")
			private String roleIds;

			@ApiModelProperty(value = "用户角色名称集合，多个用英语逗号隔开")
			@ExcelColumn(name="用户角色名称集合，多个用英语逗号隔开")
			@ApiModelProperty(value = "用户角色名称集合")
			@ExcelColumn(name="用户角色名称集合")
			private String roleNames;
			@ApiModelProperty(value = "用户角色code集合，多个用英语逗号隔开")
			@ExcelColumn(name="用户角色code集合，多个用英语逗号隔开")
			private String roleCodes;
			@ApiModelProperty(value = "是否包含下级")
			@TableField(exist = false)
			private Boolean includeChild;
			@@ -176,7 +194,30 @@
			@ApiModelProperty(value = "完整头像录")
			@TableField(exist = false)
			private String imgurlFull;
			@ApiModelProperty(value = "个人二维码图片地址")
			@ApiModelProperty(value = "个人二维码图片完整地址")
			@TableField(exist = false)
			private String qrcodeImgFull;
			@ApiModelProperty(value = "门店地址")
			@TableField(exist = false)
			private String shopAddress;
			@ApiModelProperty(value = "门店城市")
			@TableField(exist = false)
			private String shopCity;
			@ApiModelProperty(value = "是否可管理门店")
			@TableField(exist = false)
			private Boolean manageShop;

			@ApiModelProperty(value = "C端用户手机号",notes = "用于查询用户绑定的导购",hidden = true)
			@TableField(exist = false)
			private String memberPhone;

			@ApiModelProperty(value = "C端用户主键",notes = "用于查询用户绑定的导购",hidden = true)
			@TableField(exist = false)
			private Long memberId;


			@ApiModelProperty(value = "企业二维码图片完整地址")
			@TableField(exist = false)
			private String companyQrcodeImgFull;

			}