Merge remote-tracking branch 'origin/master'

tangzy

2021-09-23 96d31712c6654b2b71ed04696a9bb30af4d7f79a

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

@@ -29,6 +29,7 @@
        <result column="contacts" property="contacts"/>
        <result column="contactscell" property="contactscell"/>
        <result column="approve" property="approve"/>
        <result column="jurisdiction" property="jurisdiction"/>
    </resultMap>