java/qijisheng.git

			@@ -33,6 +33,9 @@
			@TableId("id")
			private Long id;

			@ApiModelProperty(value = "用户类型（1-普通用户，2-门店员工）")
			private Integer userType;

			@ApiModelProperty(value = "用户")
			@TableField("name")
			private String name;
			@@ -122,6 +125,10 @@
			@TableField("last_shop_time")
			private LocalDateTime lastShopTime;

			@ApiModelProperty(value = "账户余额")
			@TableField("balance")
			private BigDecimal balance;

			@ApiModelProperty(value = "可提现金额")
			@TableField("withdrawable_amount")
			private BigDecimal withdrawableAmount;
			@@ -141,11 +148,8 @@
			@ApiModelProperty(value = "分销总金额")
			@TableField("total_distribution_amount")
			private BigDecimal totalDistributionAmount;

			@ApiModelProperty(value = "账户余额")
			@TableField("balance")
			private BigDecimal balance;



			@ApiModelProperty(value = "剩余积分")
			@TableField("lave_point")
			private Integer lavePoint;
			@@ -187,24 +191,31 @@
			private String districtCode;

			@ApiModelProperty("等级1会员数")
			@TableField(exist = false)
			private Long count1;

			@ApiModelProperty("等级2会员数")
			@TableField(exist = false)
			private Long count2;

			@ApiModelProperty("等级3会员数")
			@TableField(exist = false)
			private Long count3;

			@ApiModelProperty("等级4会员数")
			@TableField(exist = false)
			private Long count4;

			@ApiModelProperty("等级5会员数")
			@TableField(exist = false)
			private Long count5;

			@ApiModelProperty("等级6会员数")
			@TableField(exist = false)
			private Long count6;

			@ApiModelProperty("等级7会员数")
			@TableField(exist = false)
			private Long count7;