Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/PageShopStoreVO.java

@@ -1,14 +1,13 @@
package com.panzhihua.common.model.vos.shop;

import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

import java.util.List;


/**
 * @auther lyq
@@ -27,7 +26,6 @@

    @ApiModelProperty("联系方式")
    private String phone;


    @ApiModelProperty("店铺状态（1.启用  2.禁用）")
    private Integer status;