wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-17 16:04:35 +08:00
parent 0b0278a9fb 0eb62c0885
commit 806dcb3d80
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java
View File

@ -209,6 +209,7 @@ public class ResourceMountController {
}
dto.setUndercarriageReason(tResourceUndercarriageApplyDTO.getReason());
dto.setUndercarriageEnclosure(tResourceUndercarriageApplyDTO.getEnclosure());
dto.setUndercarriageEnclosureName(tResourceUndercarriageApplyDTO.getEnclosureName());
dto.setUndercarriageTitle(tResourceUndercarriageApplyDTO.getTitle());
dto.setUndercarriageUserPhone(tResourceUndercarriageApplyDTO.getPhone());
dto.setDelFlag(ResourceEntityDelFlag.NORMAL.getFlag()); // 设置为正常

2
renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java
View File

@ -110,6 +110,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable {
private String undercarriageUserName;
@ApiModelProperty(value = "下架附件")
private String undercarriageEnclosure;
@ApiModelProperty(value = "下架附件名称")
private String undercarriageEnclosureName;
@ApiModelProperty(value = "下架申请标题")
private String undercarriageTitle;
@ApiModelProperty(value = "下架申请电话")

5
renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
View File

@ -140,6 +140,11 @@ public class ResourceEntity extends BaseEntity {
*/
private String undercarriageEnclosure;
/**
* 下架附件名称
*/
private String undercarriageEnclosureName;
/**
* 下架申请标题
*/

2
renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceUndercarriageApplyDTO.java
View File

@ -26,6 +26,8 @@ public class TResourceUndercarriageApplyDTO extends AuditingBaseDTO implements S
private String reason;
@ApiModelProperty(value = "下架附件")
private String enclosure;
@ApiModelProperty(value = "下架附件名称")
private String enclosureName;
@ApiModelProperty(value = "下架标题")
private String title;
}

2
renren-admin/src/main/resources/db/V5.1__resource_add_col.sql Normal file
View File

@ -0,0 +1,2 @@
alter table `tb_data_resource`
ADD COLUMN `undercarriage_enclosure_name` varchar(255) NULL comment '下架申请文件名';

2
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -41,6 +41,7 @@
<result property="pinTopTime" column="pin_top_time"/>
<result property="undercarriageTitle" column="undercarriage_title"/>
<result property="undercarriageUserPhone" column="undercarriage_phone"/>
<result property="undercarriageEnclosureName" column="undercarriage_enclosure_name"/>
</resultMap>
<resultMap id="resourceDTO" type="io.renren.modules.resource.dto.ResourceDTO">
@ -89,6 +90,7 @@
<result property="pinTopTime" column="pin_top_time"/>
<result property="undercarriageTitle" column="undercarriage_title"/>
<result property="undercarriageUserPhone" column="undercarriage_phone"/>
<result property="undercarriageEnclosureName" column="undercarriage_enclosure_name"/>
</resultMap>
<update id="deleteByIds">