From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期四, 29 九月 2022 09:40:51 +0800 Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java index ebc509c..95a0427 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActCommittee.java @@ -33,8 +33,8 @@ * 主键 */ @ApiModelProperty(value = "主键") - @TableId(type = IdType.AUTO) - private Integer id; + @TableId(type = IdType.ASSIGN_ID) + private Long id; /** * 名称 @@ -67,7 +67,12 @@ private Long userId; @ApiModelProperty(value = "创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; + @ApiModelProperty(value = "社区Id") + private Long communityId; + + private String password; + } -- Gitblit v1.7.1