From 5bd9b8d4bcf7a76315a596d3e657c33861bdbc38 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 11 三月 2022 09:51:10 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
index 934921e..e2b97c0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/model/dos/ComPbMemberDO.java
@@ -4,6 +4,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -109,6 +110,7 @@
/**
* 职能
*/
+ @TableField("`function`")
private String function;
/**
@@ -129,7 +131,7 @@
/**
* 党员审查结果 0待审核 1 审核通过 3审核失败
*/
- public interface AuditResult{
+ public interface AuditResult {
int DSH = 0;
int SHTG = 1;
int SHBH = 3;
@@ -138,7 +140,7 @@
/**
* 党员类型（1.预备党员 2.正式党员）
*/
- public interface Type{
+ public interface Type {
int YBDY = 1;
int ZSDY = 2;
}
--
Gitblit v1.7.1