java/qijisheng.git

			@@ -2,8 +2,8 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableLogic;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			@@ -119,6 +119,9 @@
			@TableField(exist = false)
			private List<AppUser> bottomUsers;

			@TableField(exist = false)
			private Page<AppUser> bottomUsersPage;

			@ApiModelProperty(value = "合伙人积分数")
			@TableField("part_point")
			private Integer partPoint;
			@@ -228,6 +231,14 @@
			@TableField("available_point")
			private Integer availablePoint;

			@ApiModelProperty(value = "可用总积分数")
			@TableField("total_available_point")
			private Integer totalAvailablePoint;

			@ApiModelProperty(value = "可转增积分")
			@TableField("transferable_point")
			private Integer transferablePoint;

			@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
			@TableField("change_promoter")
			private Integer changePromoter;
			@@ -303,7 +314,7 @@
			@TableField(exist = false)
			private Set<Integer> shopIds;

			@ApiModelProperty(value = "降级预警")
			@ApiModelProperty(value = "降级预警（0=否，1=是）")
			@TableField("is_danger")
			private Integer isDanger;

			@@ -311,7 +322,6 @@
			@TableField(exist = false)
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime lastOrderTime;


			public String getIdStr(){
			return String.valueOf(id);