Merge remote-tracking branch 'origin/master'

tangzy

2021-09-17 d9caa6f336a052a852b4b9f9fedb57bdbed77386

 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>