Merge branch 'dev'

renren-admin/src/main/java/io/renren/modules/demanData/dto/TDemandDataDTO.java

@@ -43,8 +43,10 @@ public class TDemandDataDTO extends AuditingBaseDTO implements Serializable {
     private String detailsField;
     private Long creator;
     private Date createDate;
-    @ApiModelProperty(value = "附件")
+    @ApiModelProperty(value = "附件名称")
     private String enclosure;
+    @ApiModelProperty(value = "附件")
+    private String enclosureName;
     @ApiModelProperty(value = "业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过）")
     private Integer flag;
     @ApiModelProperty(value = "业务标志提示（0:初始化 1:审批中 2:审批拒绝 3:审批通过）")

renren-admin/src/main/java/io/renren/modules/demanData/entity/TDemandDataEntity.java

@@ -57,6 +57,11 @@ public class TDemandDataEntity extends BaseEntity {
      * 附件
      */
     private String enclosure;
+
+    /**
+     * 附件名称
+     */
+    private String enclosureName;
     /**
      * 业务标志（0:初始化 1:审批中 2:审批拒绝 3:审批通过）
      */

renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml

@@ -23,6 +23,7 @@
         <result property="approvalUserDeptName" column="approval_user_dept_name"/>
         <result property="visits" column="visits"/>
         <result property="applyNumber" column="apply_number"/>
+        <result property="enclosureName" column="enclosure_name" />
     </resultMap>
 
     <update id="updateInstanceId">