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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCvtCategoryDO.java

@@ -1,9 +1,10 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;

import com.baomidou.mybatisplus.annotation.*;

import lombok.Data;

/**
 * @description: 便民服务分类
@@ -25,7 +26,6 @@
     * 分类名称
     */
    private String name;


    /**
     * 备注