Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-16 8d493a008ce655963f0363b116d5b55e02eff3d6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActProceedings.java

@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -11,10 +13,12 @@
 * @author zts
 */
@Data
@TableName("com_act_proceedings")
public class ComActProceedings implements Serializable {
    /**
     * 主键id
     */
    @TableId
    private Long id;

    /**