From cf3589ea86ab37b0cbfd7f8146be739646b9c43a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 26 Aug 2021 16:20:47 +0800
Subject: [PATCH] 1.处罚

---
 src/main/java/org/springblade/modules/punish/entity/Punish.java      |    1 +
 src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml |    4 +++-
 src/main/java/org/springblade/modules/punish/vo/PunishVO.java        |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/punish/entity/Punish.java b/src/main/java/org/springblade/modules/punish/entity/Punish.java
index c2dec59..bb1e03e 100644
--- a/src/main/java/org/springblade/modules/punish/entity/Punish.java
+++ b/src/main/java/org/springblade/modules/punish/entity/Punish.java
@@ -68,6 +68,7 @@
 	private String punishresult;
 	private String punisnum;
 	private String jurisdiction;
+	private String penalty;
 	/**
 	 * 处罚日期
 	 */
diff --git a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
index 285b840..cdc38e2 100644
--- a/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
+++ b/src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml
@@ -12,6 +12,7 @@
         <result column="jurisdiction" property="jurisdiction"/>
         <result column="enterpriseName" property="enterpriseName"/>
         <result column="jurname" property="jurname"/>
+        <result column="penalty" property="penalty"/>
     </resultMap>
 
 
@@ -22,7 +23,8 @@
                p.punishreason,
                p.punishresult,
                p.punishtime,
-               p.punisnum
+               p.punisnum,
+               p.penalty
         FROM sys_punish p
                  LEFT JOIN sys_information i ON i.departmentid = p.deptid
                  LEFT JOIN sys_jurisdiction j ON j.id = p.jurisdiction
diff --git a/src/main/java/org/springblade/modules/punish/vo/PunishVO.java b/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
index e37c330..89b6e72 100644
--- a/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
+++ b/src/main/java/org/springblade/modules/punish/vo/PunishVO.java
@@ -34,5 +34,6 @@
 	private static final long serialVersionUID = 1L;
 	private  String enterpriseName;
 	private  String jurname;
+	private  String penalty;
 
 }

--
Gitblit v1.9.3