From 905fb10c692d1ba25c0c032141e550ebc18040d9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 14 Jul 2021 16:25:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
index b5290c8..2b426d0 100644
--- a/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
+++ b/src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml
@@ -21,6 +21,8 @@
         <result column="industry" property="industry"/>
         <result column="type" property="type"/>
         <result column="permitime" property="permitime"/>
+        <result column="deptid" property="deptid"/>
+        <result column="ptype" property="ptype"/>
     </resultMap>
 
 

--
Gitblit v1.9.3