wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,290 Commits 6 Branches 12 Tags 25 MiB
Commit Graph

2175 Commits

Author SHA1 Message Date
wangliwen e19578b213 Merge branch 'master' into docker_package 2022-10-28 14:43:42 +08:00
wangliwen 5726d47220 Merge branch 'dev' 2022-10-28 14:43:35 +08:00
wangliwen d245197684 能力统计增加企业部门信息 2022-10-28 14:43:27 +08:00
wangliwen 7a3900d9a7 Merge branch 'master' into docker_package 2022-10-28 11:49:32 +08:00
wangliwen 230810b9bd Merge branch 'dev' 2022-10-28 11:49:25 +08:00
wangliwen 29458b0fc9 能力申请被拒绝时 删除申请记录 del_flg 置1 2022-10-28 11:49:16 +08:00
wangliwen 8af5693bbd Merge branch 'master' into docker_package 2022-10-27 20:38:25 +08:00
wangliwen 929668f358 Merge branch 'dev' 2022-10-27 20:38:18 +08:00
dinggang f89909e42a Merge remote-tracking branch 'origin/dev' into dev 2022-10-27 20:35:35 +08:00
dinggang f3fbf82b3a 1.门户首页基础设施统计会客厅数量错误修复 2022-10-27 20:34:58 +08:00
wangliwen 8c037768b4 Merge branch 'master' into docker_package 2022-10-27 17:54:38 +08:00
wangliwen 968b309a43 Merge branch 'dev' 2022-10-27 17:54:21 +08:00
lizhicheng 72947ca394 npe 2022-10-27 17:51:24 +08:00
wangliwen 4dae621fbf Merge branch 'master' into docker_package 2022-10-27 15:13:27 +08:00
wangliwen 2b625c6d7b Merge branch 'dev' 2022-10-27 15:13:20 +08:00
lizhicheng 5ac3e333c2 npe 2022-10-27 14:56:55 +08:00
wangliwen 4b75cde5eb Merge branch 'master' into docker_package 2022-10-27 14:50:19 +08:00
wangliwen de01721f5e Merge branch 'dev' 2022-10-27 14:50:11 +08:00
wangliwen 0c88de3898 ... 2022-10-27 14:50:01 +08:00
wangliwen c15aa57b38 Merge branch 'master' into docker_package 2022-10-27 11:34:58 +08:00
wangliwen 7610b26e8e Merge branch 'dev' 2022-10-27 11:34:51 +08:00
wangliwen d07548e6eb pageWithAttrs 非中文数量不正确的处理 2022-10-27 11:34:36 +08:00
wangliwen decb64f58f Merge branch 'master' into docker_package 2022-10-27 10:55:04 +08:00
wangliwen d557c98e5d Merge branch 'dev' 2022-10-27 10:54:57 +08:00
wangliwen f39b22751f 我的待办列表 增加会议室 2022-10-27 10:54:48 +08:00
wangliwen 65c0794bdc Merge branch 'master' into docker_package 2022-10-27 09:26:34 +08:00
wangliwen 90a5064fc4 Merge branch 'dev' 2022-10-27 09:26:22 +08:00
wangliwen 585f08af50 屮 2022-10-27 09:26:11 +08:00
huangweixiong 4042a71e4d Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev 
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
  能力下架 npe
  统计报表去掉已下架、审批时间单位、增加恩科用户
  1.能力广场列表查询增加图片 2.门户首页-能力汇聚-基础设施增加会客厅和视频会议数量查询
  审核人为默认时 允许转办
  知识库数目不一致的问题处理
  全局搜索数量支持非中文
  pageWithAttrs 支持非中文试用 like 查询模式
 2022-10-26 19:43:05 +08:00
wangliwen 49b3cbca9c Merge branch 'master' into docker_package 2022-10-26 19:22:37 +08:00
wangliwen 2c082a9792 Merge branch 'dev' 2022-10-26 19:22:30 +08:00
wangliwen d9a83fd41d 能力下架 npe 2022-10-26 19:22:21 +08:00
wangliwen e260ad66c5 Merge branch 'master' into docker_package 2022-10-26 18:04:45 +08:00
wangliwen b8c95f30f5 Merge branch 'dev' 2022-10-26 18:04:38 +08:00
lizhicheng 27d2f13fc5 统计报表去掉已下架、审批时间单位、增加恩科用户 2022-10-26 18:01:05 +08:00
wangliwen 2649876d77 Merge branch 'master' into docker_package 2022-10-26 17:36:03 +08:00
wangliwen 2292e1c984 Merge branch 'dev' 2022-10-26 17:35:57 +08:00
dinggang a34a6be0f6 1.能力广场列表查询增加图片 
2.门户首页-能力汇聚-基础设施增加会客厅和视频会议数量查询
 2022-10-26 17:22:50 +08:00
wangliwen c2a14a1d2c Merge branch 'master' into docker_package 2022-10-26 13:54:27 +08:00
wangliwen 59a15e2ce9 Merge branch 'dev' 2022-10-26 13:54:19 +08:00
wangliwen b4db7eb6fc 审核人为默认时 允许转办 2022-10-26 13:54:04 +08:00
wangliwen c0c539da01 Merge branch 'master' into docker_package 2022-10-26 11:23:38 +08:00
wangliwen 1fa80e1106 Merge branch 'dev' 2022-10-26 11:23:29 +08:00
wangliwen 088559f089 知识库数目不一致的问题处理 2022-10-26 11:23:21 +08:00
wangliwen 840348979c Merge branch 'master' into docker_package 2022-10-26 10:34:28 +08:00
wangliwen 0a4172d1bf Merge branch 'dev' 2022-10-26 10:34:20 +08:00
wangliwen e836bcb271 全局搜索数量支持非中文 2022-10-26 10:34:11 +08:00
wangliwen 6e6f7dfe07 Merge branch 'master' into docker_package 2022-10-26 09:44:42 +08:00
wangliwen 066c39ee94 Merge branch 'dev' 2022-10-26 09:44:31 +08:00
wangliwen 5f2b7d7778 pageWithAttrs 支持非中文试用 like 查询模式 2022-10-26 09:44:20 +08:00
huangweixiong 444284c473 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  1.能力广场应用广场bug修复，返回结果增加查询结果总数 2.算法广场和gis广场查询接口重写，增加按区市筛选条件，赶回结果增加查询结果总数
  查询区域管理员管理的部门 接口
  导出时间格式调整
  应用广场按应用领域搜索不正确的处理
  调整左侧树缓存时间
  能力统计增加区域参数
  enke:查询用户列表
 2022-10-26 09:18:17 +08:00
wangliwen 92d6a90977 Merge branch 'master' into docker_package 2022-10-26 09:04:33 +08:00
wangliwen ea8888e2f1 Merge branch 'dev' 2022-10-26 09:04:00 +08:00
dinggang 5cdad40773 1.能力广场应用广场bug修复，返回结果增加查询结果总数 
2.算法广场和gis广场查询接口重写，增加按区市筛选条件，赶回结果增加查询结果总数
 2022-10-25 17:41:43 +08:00
wangliwen 3b609a7b60 Merge branch 'master' into docker_package 2022-10-25 15:04:50 +08:00
wangliwen f643d4789a Merge branch 'dev' 2022-10-25 15:04:42 +08:00
wangliwen a6620a396a 查询区域管理员管理的部门 接口 2022-10-25 15:04:33 +08:00
wangliwen 133789e8ae Merge branch 'master' into docker_package 2022-10-25 14:05:20 +08:00
wangliwen 8e3adaa9de Merge branch 'dev' 2022-10-25 14:05:14 +08:00
wangliwen c6f6823f2a 导出时间格式调整 2022-10-25 14:05:05 +08:00
wangliwen ce0f0e941b Merge branch 'master' into docker_package 2022-10-25 13:40:12 +08:00
wangliwen 38c1c913ab Merge branch 'dev' 2022-10-25 13:40:05 +08:00
wangliwen b4d5f8dea0 应用广场按应用领域搜索不正确的处理 2022-10-25 13:39:57 +08:00
wangliwen 39cdf10647 Merge branch 'master' into docker_package 2022-10-25 10:27:46 +08:00
wangliwen da86313738 Merge branch 'dev' 2022-10-25 10:27:40 +08:00
wangliwen ab54087d8a 调整左侧树缓存时间 2022-10-25 10:27:32 +08:00
wangliwen 0fa6b6fba1 Merge branch 'master' into docker_package 2022-10-25 10:05:32 +08:00
wangliwen ca2de25a26 Merge branch 'dev' 2022-10-25 10:05:24 +08:00
wangliwen 00b55a9c6b 能力统计增加区域参数 2022-10-25 10:05:13 +08:00
wangliwen fd7b72d47d Merge branch 'master' into docker_package 2022-10-25 09:33:49 +08:00
wangliwen ab24e417bd Merge branch 'dev' 2022-10-25 09:33:39 +08:00
wangliwen 1ee75d834d 调整dockerfile 启动指令 2022-10-25 09:33:20 +08:00
huangweixiong cdb7cb3012 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  打包处理
  pom文件调整
 2022-10-25 09:14:05 +08:00
lizhicheng 4ab4265e19 enke:查询用户列表 2022-10-24 18:30:44 +08:00
wangliwen d372c76c4e Merge branch 'dev' 2022-10-24 17:27:21 +08:00
wangliwen 2104fa597b 打包处理 2022-10-24 17:27:12 +08:00
wangliwen edc669f15a Merge branch 'dev' 2022-10-24 15:13:09 +08:00
wangliwen 6ba7839344 pom文件调整 2022-10-24 15:12:59 +08:00
huangweixiong 7040ce1b81 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  ...
 2022-10-24 15:00:54 +08:00
wangliwen fcb9390bc7 Merge branch 'dev' 2022-10-24 14:59:42 +08:00
wangliwen bebac3abcf ... 2022-10-24 14:59:34 +08:00
wangliwen 5e4fa8fe1b Merge branch 'dev' 2022-10-24 14:27:09 +08:00
huangweixiong e8b3394d7e Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  enke视频会议
 2022-10-24 14:26:54 +08:00
huangweixiong f358cdf596 更新知识库配置文件 2022-10-24 14:09:39 +08:00
lizhicheng 08a2af2b8b enke视频会议 2022-10-24 13:59:40 +08:00
wangliwen 6402a9667d Merge remote-tracking branch 'origin/dev' 2022-10-22 10:51:31 +08:00
huangweixiong 6feb229b22 生产环境配置文件 2022-10-22 10:48:16 +08:00
huangweixiong f0084dc031 【修复】消息中心-拼接的审批人为申请人问题 2022-10-22 10:47:58 +08:00
DESKTOP-VA9NQUP\liwen b14d805a4c Merge branch 'dev' 2022-10-21 19:19:02 +08:00
dinggang f57a7f3b9c 1.门户首页全局搜索加上会议室搜索结果 
2.能力使用申请流程到资源所属部门审批节点时去除分配默认的审批人为大数据局审批员时自动通过
 2022-10-21 17:15:44 +08:00
DESKTOP-VA9NQUP\liwen 0e2c7b93ae Merge branch 'dev' 2022-10-21 14:25:47 +08:00
DESKTOP-VA9NQUP\liwen a59b6828bf Merge remote-tracking branch 'origin/dev' into dev 2022-10-21 14:25:31 +08:00
DESKTOP-VA9NQUP\liwen c8d453a94d 转办文案调整 2022-10-21 14:25:22 +08:00
huangweixiong a0c7496d97 亚威消息推送 2022-10-21 13:43:53 +08:00
DESKTOP-VA9NQUP\liwen ef6971f2eb Merge branch 'dev' 2022-10-21 12:00:32 +08:00
huangweixiong d8821ec1a6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  统计报表筛选完善
  分配到系统默认审核人时，调整通知文案
  能力统计各榜单排序逻辑修改
 2022-10-21 11:49:20 +08:00
huangweixiong 328b1872e4 消息推送将进入对应的待办列表 2022-10-21 11:48:38 +08:00
DESKTOP-VA9NQUP\liwen b4ea272340 Merge branch 'dev' 2022-10-21 10:15:38 +08:00
lizhicheng 8a70790b27 统计报表筛选完善 2022-10-21 09:56:56 +08:00
wangliwen a39f5c84c3 Merge branch 'dev' 2022-10-20 15:16:13 +08:00
wangliwen 1700ea0cae 分配到系统默认审核人时，调整通知文案 2022-10-20 15:16:03 +08:00
wangliwen e83f712193 Merge branch 'dev' 2022-10-20 11:51:38 +08:00
dinggang 583d6aaee0 能力统计各榜单排序逻辑修改 2022-10-20 11:50:12 +08:00
wangliwen e07f88e2ad Merge branch 'dev' 2022-10-20 09:33:13 +08:00
wangliwen 8c256f315d 代码格式化 2022-10-20 09:33:01 +08:00
wangliwen 9c1b01c6d1 Merge branch 'dev' 2022-10-19 14:04:01 +08:00
wangliwen 027e493020 ... 2022-10-19 14:03:52 +08:00
wangliwen 0b9ee53bc8 Merge branch 'dev' 2022-10-19 11:13:43 +08:00
lizhicheng 30a4ce6797 统计报表加分页 2022-10-19 10:16:23 +08:00
wangliwen 5d0b4bc32d Merge branch 'dev' 2022-10-19 08:54:22 +08:00
huangweixiong 1bcb055baf Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  CIM智能算法改开发组件
 2022-10-18 17:35:29 +08:00
huangweixiong 109a2a1f79 待办推送格式修改 2022-10-18 17:34:59 +08:00
wangliwen 4245d1c782 Merge branch 'dev' 2022-10-18 17:22:45 +08:00
wangliwen 14a9aa33ae Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-10-18 17:22:34 +08:00
wangliwen d7f8bf7656 Merge branch 'dev' 2022-10-18 17:21:41 +08:00
lizhicheng 317a0d21aa CIM智能算法改开发组件 2022-10-18 17:07:46 +08:00
huangweixiong b326c8e24b Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  数据异常导出失败
  npe
  导出表头宽度自适应
  调整导出文件名
  ...
  能力统计 导出
  CIM组件统计改为开发组件
  selectDeptDetailTypeCountList 增加导出接口
  npe
  会议室重复统计
  ...
  npe
  ...
  能力使用部门排序
  屮
  ...
  ...
  HIQDUCS-100 的处理
  设备申请新增设备详情字段
  统计报表状态修改
 2022-10-18 16:41:18 +08:00
huangweixiong 482e3fd51c 修改能力申请的发送通知 2022-10-18 16:40:39 +08:00
wangliwen 488ed3ec33 Merge branch 'dev' 2022-10-18 15:43:30 +08:00
wangliwen f2a1b152a8 数据异常导出失败 2022-10-18 15:43:22 +08:00
wangliwen 03a0b43941 Merge branch 'dev' 2022-10-18 15:21:59 +08:00
wangliwen a4047352c1 npe 2022-10-18 15:21:50 +08:00
wangliwen 1d16cca31b Merge branch 'dev' 2022-10-18 14:38:49 +08:00
wangliwen f1d3fea424 导出表头宽度自适应 2022-10-18 14:38:41 +08:00
wangliwen 847f1490b8 Merge branch 'dev' 2022-10-18 13:44:04 +08:00
wangliwen 094d27fddf 调整导出文件名 2022-10-18 13:43:54 +08:00
wangliwen 7499cbf4a0 Merge branch 'dev' 2022-10-18 11:31:38 +08:00
wangliwen fa94eb77f3 ... 2022-10-18 11:31:31 +08:00
wangliwen c9c256ff87 Merge branch 'dev' 2022-10-18 11:18:36 +08:00
wangliwen 17cd5900f8 Merge remote-tracking branch '备份/dev' into dev 2022-10-18 11:18:24 +08:00
wangliwen 020a32519a 能力统计 导出 2022-10-18 11:18:11 +08:00
lizhicheng 7c4b941031 CIM组件统计改为开发组件 2022-10-18 10:00:46 +08:00
wangliwen 41d382c71a Merge branch 'dev' 2022-10-18 09:58:18 +08:00
wangliwen c02702e70e selectDeptDetailTypeCountList 增加导出接口 2022-10-18 09:58:06 +08:00
wangliwen 6004a99da7 Merge branch 'dev' 2022-10-18 09:05:05 +08:00
lizhicheng 9961970fb1 npe 2022-10-17 17:56:53 +08:00
wangliwen 3e54f99052 Merge branch 'dev' 2022-10-17 16:54:43 +08:00
wangliwen 5b85df5010 会议室重复统计 2022-10-17 16:54:25 +08:00
wangliwen 02893504fc Merge branch 'dev' 2022-10-17 16:29:03 +08:00
wangliwen a2231e4d11 ... 2022-10-17 16:28:54 +08:00
wangliwen 6701c763a8 Merge branch 'dev' 2022-10-17 16:18:20 +08:00
wangliwen 834fbb9d8c npe 2022-10-17 16:18:10 +08:00
wangliwen 1b9f87b6ff Merge branch 'dev' 2022-10-17 16:07:29 +08:00
wangliwen c63bff7ef8 ... 2022-10-17 16:07:22 +08:00
wangliwen b263804884 Merge branch 'dev' 2022-10-17 16:04:21 +08:00
wangliwen abc082624d 能力使用部门排序 2022-10-17 16:03:32 +08:00
wangliwen cb3e72fd48 Merge branch 'dev' 2022-10-17 14:15:31 +08:00
wangliwen b25309c134 屮 2022-10-17 14:15:23 +08:00
wangliwen 23fcf66cd5 Merge branch 'dev' 2022-10-17 14:07:17 +08:00
wangliwen f1c2cbc28e ... 2022-10-17 14:07:07 +08:00
wangliwen 67de630ca0 Merge branch 'dev' 2022-10-17 13:57:35 +08:00
wangliwen ad54ba9ac1 ... 2022-10-17 13:56:19 +08:00
wangliwen 8f6b530a0d Merge branch 'dev' 2022-10-17 13:12:47 +08:00
wangliwen dd08d7b139 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-10-17 13:12:34 +08:00
wangliwen f8241322ef Merge branch 'dev' 2022-10-17 13:11:40 +08:00
wangliwen 0d44e8c81c Merge remote-tracking branch '备份/dev' into dev 
# Conflicts:
#	renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
 2022-10-17 13:11:30 +08:00
wangliwen ce11e658ff HIQDUCS-100 的处理 2022-10-17 13:09:46 +08:00
huangweixiong 234732dea0 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (64 commits)
  发起人主动终止时 补充意见
  环境不一致，sql修改
  草泥马
  ..
  去掉
  ..
  1.系统运行初始化数据调整 2.修复后台能力统计能力申请明细会议室申请状态错误bug
  调整
  。。。
  屮
  。。。
  。。。
  屮尼玛
  ...
  后台能力统计明细增加会议室申请
  。。。
  apply_amount 增加会客厅数量
  ...
  sql文件命名冲突
  1.修改前后台能力申请统计逻辑，加入会议室申请统计 2.赋能场景增加字段
  ...

# Conflicts:
#	renren-admin/src/main/java/io/renren/modules/gateway/controller/MonitorControllerV2.java
 2022-10-15 00:26:07 +08:00
huangweixiong 6a50857c2e 升级shiro，阿里云暂时没有最新包 2022-10-15 00:22:13 +08:00
huangweixiong 79b86cb96c 亚威组织导出接口 2022-10-15 00:21:28 +08:00
lizhicheng 85d1e9eddf 设备申请新增设备详情字段 2022-10-14 17:23:53 +08:00
lizhicheng 64e53c3535 统计报表状态修改 2022-10-14 14:57:46 +08:00
wangliwen a1fbce7737 Merge branch 'dev' 2022-10-14 11:26:58 +08:00
wangliwen b1376f4646 发起人主动终止时 补充意见 2022-10-14 11:25:58 +08:00
wangliwen 27b34d26c2 Merge branch 'dev' 2022-10-14 11:15:04 +08:00
dinggang 74523031c8 环境不一致，sql修改 2022-10-13 23:43:55 +08:00
wangliwen 4fdfb45b1c Merge branch 'dev' 2022-10-13 23:08:11 +08:00
wangliwen e920447f39 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 23:08:01 +08:00
wangliwen 2ca1096ecc 草泥马 2022-10-13 23:07:37 +08:00
dinggang 227db45035 .. 2022-10-13 23:04:15 +08:00
wangliwen 14768c994a Merge branch 'dev' 2022-10-13 22:57:09 +08:00
wangliwen 7ca30e38c2 去掉 2022-10-13 22:56:49 +08:00
wangliwen 339dd090fc Merge branch 'dev' 2022-10-13 22:03:14 +08:00
dinggang de5d3738d7 .. 2022-10-13 22:02:20 +08:00
wangliwen 096470457e Merge branch 'dev' 2022-10-13 21:50:11 +08:00
dinggang 88bbff3b8f 1.系统运行初始化数据调整 
2.修复后台能力统计能力申请明细会议室申请状态错误bug
 2022-10-13 21:47:31 +08:00
wangliwen 2b599faa4a Merge branch 'dev' 2022-10-13 21:32:12 +08:00
wangliwen f3cb2206cb 调整 2022-10-13 21:32:01 +08:00
wangliwen 719484fad7 Merge branch 'dev' 2022-10-13 20:58:20 +08:00
wangliwen 1373ab7088 。。。 2022-10-13 20:58:11 +08:00
wangliwen 88e00d54d8 Merge branch 'dev' 2022-10-13 20:43:00 +08:00
wangliwen 0e3e460164 屮 2022-10-13 20:42:53 +08:00
wangliwen 2928c04e85 Merge branch 'dev' 2022-10-13 20:34:56 +08:00
wangliwen c348b6d9eb 。。。 2022-10-13 20:34:49 +08:00
wangliwen 2673802567 Merge branch 'dev' 2022-10-13 20:26:02 +08:00
wangliwen 127a4f7a56 。。。 2022-10-13 20:25:40 +08:00
wangliwen dd957414d8 Merge branch 'dev' 2022-10-13 20:21:54 +08:00
wangliwen fa138f5b57 屮尼玛 2022-10-13 20:21:46 +08:00
wangliwen 0b9505136f Merge branch 'dev' 2022-10-13 19:49:45 +08:00
wangliwen d67abf81a1 ... 2022-10-13 19:49:34 +08:00
wangliwen 65112dc728 Merge branch 'dev' 2022-10-13 17:52:03 +08:00
dinggang 785276c635 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 17:50:47 +08:00
dinggang 98a0715bf5 后台能力统计明细增加会议室申请 2022-10-13 17:50:17 +08:00
wangliwen e0cd927455 Merge branch 'dev' 2022-10-13 17:49:13 +08:00
wangliwen e98febf4c6 。。。 2022-10-13 17:49:06 +08:00
wangliwen 639e885225 Merge branch 'dev' 2022-10-13 17:37:36 +08:00
wangliwen cd6c670a18 apply_amount 增加会客厅数量 2022-10-13 17:37:25 +08:00
wangliwen 244f5ed2e4 Merge branch 'dev' 2022-10-13 17:06:38 +08:00
dinggang c14fe24878 ... 2022-10-13 17:04:58 +08:00
wangliwen 156756bac2 Merge branch 'dev' 2022-10-13 16:52:22 +08:00
dinggang 433d353d4f sql文件命名冲突 2022-10-13 16:51:45 +08:00
wangliwen 208829c4f8 Merge branch 'dev' 2022-10-13 16:45:37 +08:00
dinggang c583280b35 1.修改前后台能力申请统计逻辑，加入会议室申请统计 
2.赋能场景增加字段
 2022-10-13 16:44:46 +08:00
wangliwen e7dc109193 Merge branch 'dev' 2022-10-13 14:50:34 +08:00
wangliwen b45316d33b 屮 2022-10-13 14:50:23 +08:00
wangliwen eb543c2695 Merge branch 'dev' 2022-10-13 12:50:03 +08:00
wangliwen a6733814ae 。。。 2022-10-13 12:49:54 +08:00
wangliwen f8b0b44cb2 Merge branch 'dev' 2022-10-13 11:57:11 +08:00
wangliwen b4cc23f323 屮 2022-10-13 11:57:03 +08:00
wangliwen eaa8dc4482 Merge branch 'dev' 2022-10-13 11:49:29 +08:00
dinggang 1b87f215f9 Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 11:48:18 +08:00
dinggang 9113da88bb 后台管理-能力统计新增会议室申请统计 2022-10-13 11:47:42 +08:00
wangliwen e40428d48e Merge branch 'dev' 2022-10-13 11:46:42 +08:00
wangliwen 9fdda47fcc Merge remote-tracking branch 'origin/dev' into dev 2022-10-13 11:46:31 +08:00
wangliwen 8e4eac8030 tb_fuse_resource 字段调整 2022-10-13 11:46:24 +08:00
dinggang 2467da9106 字段名修改 2022-10-13 11:32:29 +08:00
dinggang 4f37523519 1.融合服务新增各种资源数量字段 2022-10-13 11:02:37 +08:00
wangliwen 3ecbda2a60 Merge branch 'dev' 2022-10-13 10:44:31 +08:00
wangliwen 1e8d781ba5 selectResourceListByType 接口数量调整 2022-10-13 10:43:36 +08:00
wangliwen 6cc646b959 Merge branch 'dev' 2022-10-13 10:17:56 +08:00
wangliwen 35b53fa901 文案调整 2022-10-13 10:17:44 +08:00
wangliwen 09998753b2 Merge remote-tracking branch 'origin/dev' 2022-10-13 09:39:47 +08:00
dinggang 02398a3641 1.同步sys_menu菜单 
2.实现访客模式功能
 2022-10-13 09:37:24 +08:00
wangliwen 05b57f3340 Merge branch 'dev' 2022-10-12 19:04:19 +08:00
wangliwen 7c763efbd6 ...增加资源所属部门名称 2022-10-12 19:04:09 +08:00
wangliwen 6623fe87fd Merge branch 'dev' 2022-10-12 18:52:05 +08:00
wangliwen e6191ab72e 资源申请量去掉 基础设施数量 2022-10-12 18:51:19 +08:00
wangliwen 1362c2dcd3 Merge branch 'dev' 2022-10-12 17:11:35 +08:00
wangliwen 357971f23b 菜单增加 site 站点标识 字段 2022-10-12 17:11:04 +08:00
wangliwen 997edea1cd Merge branch 'dev' 2022-10-12 16:20:42 +08:00
wangliwen da4fab24bc ... 2022-10-12 16:20:32 +08:00
wangliwen 5c9a8a83d8 Merge remote-tracking branch '备份/dev' into dev 2022-10-12 16:18:57 +08:00
wangliwen 57c0e17208 Merge branch 'dev' 2022-10-12 16:16:37 +08:00
wangliwen 48cccebdfd 通知文案调整 2022-10-12 16:15:51 +08:00
lizhicheng 6e22e9929f 申请历史修改时长单位 2022-10-12 16:08:58 +08:00
wangliwen 500b68d429 Merge branch 'dev' 2022-10-12 15:57:33 +08:00
wangliwen 0c1a606dd4 增加我的待办各类型的待办数量 2022-10-12 15:57:18 +08:00
wangliwen 1a60f96ad8 Merge branch 'dev' 2022-10-12 15:15:36 +08:00
wangliwen b19598a4cb Merge remote-tracking branch '备份/dev' into dev 2022-10-12 15:15:28 +08:00
wangliwen 6e80f7cdaf 重复申请发送通知 2022-10-12 15:15:21 +08:00
lizhicheng 57af11a4a0 基础设施去掉感知资源分类 2022-10-12 11:19:00 +08:00
wangliwen d947510ebe Merge branch 'dev' 2022-10-12 09:57:05 +08:00
wangliwen 6612b514c8 模型文案调整 2022-10-12 09:56:54 +08:00
wangliwen 388b8f67a0 Merge branch 'dev' 2022-10-12 09:42:28 +08:00
wangliwen 5bff2763a9 审批详情——市级区市管理员——改为市级管理员 HIQDUCS-17 2022-10-12 09:42:18 +08:00
wangliwen 5fb69dc48c Merge branch 'dev' 2022-10-11 19:59:21 +08:00
wangliwen 6857ccb90e npe 2022-10-11 19:59:14 +08:00
wangliwen 8cb99adfc4 Merge branch 'dev' 2022-10-11 19:48:14 +08:00
wangliwen bc4a0f6635 。。。 2022-10-11 19:48:06 +08:00
wangliwen 1634cb4aad Merge branch 'dev' 2022-10-11 19:36:14 +08:00