Merge remote-tracking branch 'origin/master'

zengh

2021-08-28 99081be70e456268640014a6369c55c5fec29f2d

 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>