Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-business/src/main/java/com/qmth/sop/business/bean/result/TBDelayWarnResult.java

@@ -45,6 +45,10 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
     @ApiModelProperty(value = "项目名称")
     private String crmName;
 
+
+    @ApiModelProperty(value = "创建人")
+    private String createName;
+
     @ApiModelProperty(value = "跟进记录")
     List<TBDelayWarnDetail> tbDelayWarnDetails=new ArrayList<>();
 
@@ -95,4 +99,12 @@ public class TBDelayWarnResult extends TBDelayWarn implements Serializable {
     public void setTbDelayWarnDetails(List<TBDelayWarnDetail> tbDelayWarnDetails) {
         this.tbDelayWarnDetails = tbDelayWarnDetails;
     }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
 }

sop-business/src/main/resources/mapper/TBDelayWarnMapper.xml

@@ -9,9 +9,11 @@
         u.real_name user_name,
         sc.NAME custom,
         sc.type custom_type,
-        c.NAME crm_name
+        c.NAME crm_name,
+        cu.name create_name
         FROM
         t_b_delay_warn a
+        LEFT JOIN sys_user cu ON cu.id = a.create_id
         LEFT JOIN sys_user u ON u.id = a.user_id
         LEFT JOIN t_b_crm c ON c.crm_no = a.crm_no
         LEFT JOIN sys_custom sc ON sc.id = c.custom_id