Merge branch 'dxl'

# Conflicts:
#	yt-risk/risk-manage/src/main/java/com/ytpm/controller/RiskConfigController.java
#	yt-risk/risk-manage/src/main/resources/mapper/RiskConfigMapper.xml

yt-common/src/main/java/com/ytpm/risk/view/RiskConfigListView.java

@@ -30,8 +30,16 @@ public class RiskConfigListView extends PageMeta {
     private String createUserId;
     @ApiModelProperty("修改时间")
     private Date updateTime;
-    @ApiModelProperty("修改者")
+    @ApiModelProperty("修改者id")
     private String updateUserId;
     @ApiModelProperty("是否启用")
     private Integer enabled;
+    @ApiModelProperty("创建人名称")
+    private String nickName;
+    @ApiModelProperty("appId")
+    private String appId;
+    @ApiModelProperty("appName")
+    private String appName;
+    @ApiModelProperty("修改者")
+    private String updateNickName;
 }

yt-risk/risk-manage/src/main/java/com/ytpm/controller/RiskConfigController.java

@@ -54,7 +54,7 @@ public class RiskConfigController {
      */
     @ApiOperation("查询风控配置列表")
     @PostMapping("/list")
-    public ResultTable<RiskConfigListView> getRiskConfigList(@RequestBody RiskConfigParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo){
+    public ResultTable<RiskConfigListView> getRiskConfigList(@RequestBody RiskConfigParam param, @AuthenticationPrincipal AgentUserInfo userInfo){
         param.setChannelId(userInfo.getUserId());
         return riskService.getRiskConfigList(param);
     }

yt-risk/risk-manage/src/main/resources/mapper/RiskConfigMapper.xml

@@ -86,11 +86,21 @@
         SELECT
             t.app_id,
             p.app_name,
+            t.template_name,
+            t.create_time,
+            t.template_id,
             t.template_code,
-            t.template_content
+            t.template_content,
+            u.nick_name as nickName,
+            t.enabled,
+            p.app_name,
+            t.update_time,
+            u_update.nick_name as updateNickName
         FROM
             yt_risk_template t
+                JOIN yt_platform_user u on t.create_user_id = u.user_id
                 JOIN yt_app p ON t.app_id = p.app_id
+                LEFT JOIN yt_platform_user u_update ON t.update_user_id = u_update.user_id
         WHERE
             t.channel_id = #{channelId}
     </select>