From 68b6b98c434a66cc2eeb77dd99a2b54dd0bb6031 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 23 Sep 2021 15:22:20 +0800
Subject: [PATCH] 1.附件

---
 src/main/java/org/springblade/modules/record/entity/Record.java      |   12 ++++++++++++
 src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml |    6 ++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index 7d24cad..9a924ba 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -155,6 +155,18 @@
 	private String cardid;
 	private String jurisdiction;
 	private String ptype;
+	//派出所审批
+	private String papprove;
+	//县审批
+	private String xapprove;
+	//市审批
+	private String sapprove;
+	//派出意见
+	private String popinion;
+	//县意见
+	private String xopinion;
+	//市意见
+	private String sopinion;
 	@ApiModelProperty(value = "提交时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index e84ca89..0296ab9 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -31,6 +31,12 @@
         <result column="jurisdiction" property="jurisdiction"/>
         <result column="cardid" property="cardid"/>
         <result column="ptype" property="ptype"/>
+        <result column="papprove" property="papprove"/>
+        <result column="xapprove" property="xapprove"/>
+        <result column="sapprove" property="sapprove"/>
+        <result column="popinion" property="popinion"/>
+        <result column="xopinion" property="xopinion"/>
+        <result column="sopinion" property="sopinion"/>
     </resultMap>
 
 

--
Gitblit v1.9.3