Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/resource/mapper/AttachMapper.xml

@@ -18,6 +18,8 @@
        <result column="original_name" property="originalName"/>
        <result column="extension" property="extension"/>
        <result column="attach_size" property="attachSize"/>
        <result column="deptid" property="deptid"/>
        <result column="type" property="type"/>
    </resultMap>