Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev

src/main/resources/mybatis/dsno3/eduArchives/ArchivesMapper.xml

@@ -7,11 +7,13 @@
         SELECT
         f.*,
         c.CORP_NAME,
-        ifnull(pn.count,0) as POST_NUM
+        ifnull(pn.count,0) as POST_NUM,
+        tdic.NAME AS TRAININGTYPE_NAME
         FROM
         BUS_CLASS f
         LEFT JOIN
         `qa-traffic-prevention`.`bus_corp_info` c ON c.CORPINFO_ID = f.CORPINFO_ID
+        LEFT JOIN BUS_TRAINING_TYPE tdic ON f.TRAINTYPE = tdic.TRAININGTYPE_ID
         LEFT JOIN
         (SELECT COUNT(1) count,p.CLASS_ID FROM bus_class_post p WHERE p.ISDELETE = 0 GROUP BY p.CLASS_ID) pn ON
         pn.CLASS_ID=f.CLASS_ID