|
|
|
@@ -111,8 +111,8 @@ public class WxMerchant extends BaseEntity { |
|
|
|
@Excel(name="联系方式",width = 20,orderNum = "3") |
|
|
|
private String linkPhone; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") |
|
|
|
@Excel(name="创建时间",width = 20,format="yyyy-MM-dd",orderNum = "10") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") |
|
|
|
private Date createDate; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") |
|
|
|
private Date updateDate; |
|
|
|
@@ -156,8 +156,8 @@ public class WxMerchant extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="是否为商管商户 1是 0否",name="status") |
|
|
|
private Integer isAdmin; |
|
|
|
|
|
|
|
@Excel(name = "待缴提醒", width = 20, orderNum = "12") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "待缴提醒", name = "billSetting") |
|
|
|
@Excel(name = "待缴提醒", width = 20, orderNum = "12") |
|
|
|
private Integer billSetting; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") |
|
|
|
@@ -172,12 +172,19 @@ public class WxMerchant extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") |
|
|
|
private String actionDesc; |
|
|
|
|
|
|
|
@Transient |
|
|
|
private WxProfitSharingReceiver wxProfitSharingReceiver; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") |
|
|
|
private Integer isDel; |
|
|
|
|
|
|
|
@Excel(name = "主谈人", width = 20, orderNum = "13") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "主谈人", name = "talkUserMain") |
|
|
|
private String talkUserMain; |
|
|
|
|
|
|
|
@Excel(name = "辅谈人", width = 20, orderNum = "14") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "辅谈人", name = "talkUserAux") |
|
|
|
private String talkUserAux; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") |
|
|
|
private Integer isDel; |
|
|
|
@Transient |
|
|
|
private WxProfitSharingReceiver wxProfitSharingReceiver; |
|
|
|
|
|
|
|
@Override |
|
|
|
public String getSortColumns() { |
|
|
|
|