|
|
|
@@ -126,10 +126,10 @@ public class WxMerchant extends BaseEntity { |
|
|
|
private String talkUserAux; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") |
|
|
|
private Date starttime; |
|
|
|
private transient Date starttime; |
|
|
|
|
|
|
|
@io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endTime") |
|
|
|
private Date endtime; |
|
|
|
private transient Date endtime; |
|
|
|
|
|
|
|
public String getShopsStr() { |
|
|
|
if (shopVos != null && shopVos.size() > 0) { |
|
|
|
|