| @@ -12,7 +12,6 @@ import java.util.Date; | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxMallApply extends BaseEntity { | public class WxMallApply extends BaseEntity { | ||||
| private static final long serialVersionUID = 1L; | |||||
| protected Long id; | protected Long id; | ||||
| @@ -1,19 +1,17 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @TableName(value = "wx_question") | @TableName(value = "wx_question") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxQuestion extends BaseEntity { | |||||
| public class WxQuestion extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") | @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") | ||||
| private String content; | private String content; | ||||
| @@ -2,7 +2,7 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -12,13 +12,10 @@ import java.util.List; | |||||
| @TableName(value = "wx_question_config") | @TableName(value = "wx_question_config") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxQuestionConfig extends BaseEntity { | |||||
| public class WxQuestionConfig extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") | @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") | ||||
| private String questionList; | private String questionList; | ||||
| @@ -1,7 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -11,12 +11,10 @@ import java.util.Date; | |||||
| @TableName(value = "wx_question_log") | @TableName(value = "wx_question_log") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxQuestionLog extends BaseEntity { | |||||
| public class WxQuestionLog extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="问题ID",name="questionId") | @io.swagger.annotations.ApiModelProperty(value="问题ID",name="questionId") | ||||
| @@ -3,7 +3,7 @@ package com.iformall.domain.po; | |||||
| import com.alibaba.fastjson.JSONObject; | import com.alibaba.fastjson.JSONObject; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -25,7 +25,7 @@ import java.util.List; | |||||
| @TableName(value = "wx_score_rules") | @TableName(value = "wx_score_rules") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxScoreRules extends BaseEntity { | |||||
| public class WxScoreRules extends BaseTenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| public static final int DEFAULT_SCALE = 10; | public static final int DEFAULT_SCALE = 10; | ||||
| @@ -89,10 +89,6 @@ public class WxScoreRules extends BaseEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") | @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") | ||||
| private String rules; | private String rules; | ||||
| @@ -1,7 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -10,7 +10,7 @@ import java.util.*; | |||||
| @TableName(value = "wx_user_visit") | @TableName(value = "wx_user_visit") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxUserVisit extends BaseEntity { | |||||
| public class WxUserVisit extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @@ -1,7 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -10,15 +10,12 @@ import java.util.Date; | |||||
| @TableName(value = "wx_weapp_audit_status") | @TableName(value = "wx_weapp_audit_status") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappAuditStatus extends BaseEntity { | |||||
| public class WxWeappAuditStatus extends BaseTenantEntity { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| private String appId; | private String appId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") | ||||
| @@ -1,7 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -10,14 +10,11 @@ import java.util.Date; | |||||
| @TableName(value = "wx_weapp_code_status") | @TableName(value = "wx_weapp_code_status") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappCodeStatus extends BaseEntity { | |||||
| public class WxWeappCodeStatus extends BaseTenantEntity { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | @io.swagger.annotations.ApiModelProperty(value="小程序ID",name="appId") | ||||
| private String appId; | private String appId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端 3-公众服务号 4-公众订阅号)",name="type") | @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端 3-公众服务号 4-公众订阅号)",name="type") | ||||
| @@ -1,7 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -10,7 +10,7 @@ import java.util.Date; | |||||
| @TableName(value = "wx_weapp_release_status") | @TableName(value = "wx_weapp_release_status") | ||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxWeappReleaseStatus extends BaseEntity { | |||||
| public class WxWeappReleaseStatus extends BaseTenantEntity { | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| protected Long id; | protected Long id; | ||||
| @@ -12,4 +12,12 @@ import lombok.EqualsAndHashCode; | |||||
| public class BaseTenantEntity extends BaseEntity { | public class BaseTenantEntity extends BaseEntity { | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| public void setTenantInfo(TenantEntity info) { | |||||
| setTenantId(info.getTenantId()); | |||||
| } | |||||
| public void setTenantInfo(BaseTenantEntity info) { | |||||
| setTenantId(info.getTenantId()); | |||||
| } | |||||
| } | } | ||||
| @@ -12,4 +12,12 @@ import lombok.EqualsAndHashCode; | |||||
| public class TenantEntity extends BaseEntity { | public class TenantEntity extends BaseEntity { | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| public void setTenantInfo(TenantEntity info) { | |||||
| setTenantId(info.getTenantId()); | |||||
| } | |||||
| public void setTenantInfo(BaseTenantEntity info) { | |||||
| setTenantId(info.getTenantId()); | |||||
| } | |||||
| } | } | ||||
| @@ -3,9 +3,9 @@ package com.iformall.domain.po.invest; | |||||
| import com.baomidou.mybatisplus.annotation.IdType; | import com.baomidou.mybatisplus.annotation.IdType; | ||||
| import com.baomidou.mybatisplus.annotation.TableId; | import com.baomidou.mybatisplus.annotation.TableId; | ||||
| import com.fasterxml.jackson.annotation.*; | import com.fasterxml.jackson.annotation.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import java.io.Serializable; | |||||
| import java.util.*; | import java.util.*; | ||||
| /** | /** | ||||
| @@ -13,9 +13,7 @@ import java.util.*; | |||||
| * @date 2019/4/24 14:32 | * @date 2019/4/24 14:32 | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| public class InvestBaseEntity implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class InvestBaseEntity extends TenantEntity { | |||||
| public static final String COLUMN_TYPE = "json"; | public static final String COLUMN_TYPE = "json"; | ||||
| @@ -1,6 +1,6 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import com.iformall.domain.po.base.BaseEntity; | |||||
| import com.iformall.domain.po.base.BaseTenantEntity; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -8,14 +8,10 @@ import java.util.Date; | |||||
| @Data | @Data | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxFloatingLayerVO extends BaseEntity { | |||||
| private static final long serialVersionUID = 1L; | |||||
| public class WxFloatingLayerVO extends BaseTenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | |||||
| private String tenantId; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") | @io.swagger.annotations.ApiModelProperty(value = "封面图", name = "coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||