From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/punish/mapper/PunishMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
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
--
Gitblit v1.9.3