Merge remote-tracking branch 'origin/master'

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmVo.java

@@ -61,4 +61,5 @@ public class RiskAlarmVo implements Vo {
     private String typeCode;
     @ApiModelProperty("风险类别名称")
     private String typeName;
+    private String bigTypeName;
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.xml

@@ -2,8 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.supervise.rms.biz.riskalarm.RiskAlarmMapper">
     <select id="listPage" resultType="com.supervise.rms.api.riskalarm.RiskAlarmVo">
-        select *
-        from risk_alarm
+        select a.*,t.name bigTypeName
+        from risk_alarm a
+        left join risk_type l on a.typeSid = l.sid
+        left join risk_type t on l.parentSid = t.sid
         <where>
             ${ew.sqlSegment}
         </where>