Merge remote-tracking branch 'origin/master'

zengh

2021-08-27 8c28e0e9d71b84eb18a3b40a9afc46ab50269aa2

 src/main/java/org/springblade/modules/talk/mapper/TalkMapper.xml

@@ -12,6 +12,7 @@
        <result column="conclusion" property="conclusion"/>
        <result column="evaluate" property="evaluate"/>
        <result column="deptid" property="deptid"/>
        <result column="imgurl" property="imgurl"/>
    </resultMap>