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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
dinggang 2022-10-13 11:48:18 +08:00
parent 9113da88bb 9fdda47fcc
commit 1b87f215f9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseResourceDTO.java
View File

@ -19,7 +19,7 @@ public class TbFuseResourceDTO {
@ApiModelProperty(value = "融合服务id") @ApiModelProperty(value = "融合服务id")
private Long fuseId; private Long fuseId;
@ApiModelProperty(value = "资源id") @ApiModelProperty(value = "资源id")
private Long resourceId; private String resourceId;
@ApiModelProperty(value = "资源挂载顺序") @ApiModelProperty(value = "资源挂载顺序")
private String sequence; private String sequence;
@ApiModelProperty(value = "资源") @ApiModelProperty(value = "资源")

2
renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseResourceEntity.java
View File

@ -27,7 +27,7 @@ public class TbFuseResourceEntity {
/** /**
* 资源id * 资源id
*/ */
private Long resourceId; private String resourceId;
/** /**
* 顺序 * 顺序
*/ */

1
renren-admin/src/main/resources/db/V6.5__fuse_update_col.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE `tb_fuse_resource` MODIFY COLUMN `resource_id` longtext NOT NULL COMMENT '资源id';