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

huanghongfa

2021-07-16 a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07

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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -18,6 +20,7 @@
     * villageId
     */
    @TableId(value = "village_id",type = IdType.INPUT)
    @JsonSerialize(using = ToStringSerializer.class)
    private Long villageId;
    /**
     * 街路巷