Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 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