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

Merge branch 'dev'

This commit is contained in:
wangliwen 2023-01-06 16:56:30 +08:00
parent eaeaae9b00 85a0d391ec
commit 2613f89efd
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/resources/db/V8.8__tb_fuse_col.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE `tb_fuse` MODIFY COLUMN `description` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '融合服务描述';
ALTER TABLE `tb_fuse` MODIFY COLUMN `scene_url` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '场景入口';
ALTER TABLE `tb_fuse_attr`MODIFY COLUMN `attr_type` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '属性类型',
MODIFY COLUMN `attr_value` longtext CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL COMMENT '属性值';

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

@ -2418,7 +2418,7 @@
</select> </select>
<select id="selectProvideDeptNameByIds" resultType="java.lang.String"> <select id="selectProvideDeptNameByIds" resultType="java.lang.String">
SELECT SELECT
DISTINCT sd.name AS "provideDept" DISTINCT sd.name AS "provideDept"
FROM FROM
tb_data_resource tdr, sys_dept sd tb_data_resource tdr, sys_dept sd
WHERE WHERE