Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 src/main/java/org/springblade/modules/permit/mapper/PermitMapper.xml

@@ -21,6 +21,15 @@
        <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"/>
        <result column="storage" property="storage"/>
        <result column="cardid" property="cardid"/>
        <result column="representativecell" property="representativecell"/>
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="approve" property="approve"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>