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

Commit Graph

  • 1b9f87b6ff Merge branch 'dev' wangliwen 2022-10-17 16:07:29 +0800
  • c63bff7ef8 ... wangliwen 2022-10-17 16:07:22 +0800
  • 3f290fd2dd Merge branch 'master' into docker_package wangliwen 2022-10-17 16:04:37 +0800
  • b263804884 Merge branch 'dev' wangliwen 2022-10-17 16:04:21 +0800
  • abc082624d 能力使用部门排序 wangliwen 2022-10-17 16:03:32 +0800
  • 60c2810b7a Merge branch 'master' into docker_package wangliwen 2022-10-17 14:15:38 +0800
  • cb3e72fd48 Merge branch 'dev' wangliwen 2022-10-17 14:15:31 +0800
  • b25309c134 屮 wangliwen 2022-10-17 14:15:23 +0800
  • 52291490cb Merge branch 'master' into docker_package wangliwen 2022-10-17 14:07:24 +0800
  • 23fcf66cd5 Merge branch 'dev' wangliwen 2022-10-17 14:07:17 +0800
  • f1c2cbc28e ... wangliwen 2022-10-17 14:07:07 +0800
  • 5a8e5643da Merge branch 'master' into docker_package wangliwen 2022-10-17 13:57:42 +0800
  • 67de630ca0 Merge branch 'dev' wangliwen 2022-10-17 13:57:35 +0800
  • ad54ba9ac1 ... wangliwen 2022-10-17 13:56:19 +0800
  • fa826e94a9 Merge branch 'master' into docker_package wangliwen 2022-10-17 13:12:54 +0800
  • 8f6b530a0d Merge branch 'dev' wangliwen 2022-10-17 13:12:47 +0800
  • dd08d7b139 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev wangliwen 2022-10-17 13:12:34 +0800
  • 5581cabf8f Merge branch 'master' into docker_package wangliwen 2022-10-17 13:11:49 +0800
  • f8241322ef Merge branch 'dev' wangliwen 2022-10-17 13:11:40 +0800
  • 0d44e8c81c Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-10-17 13:11:30 +0800
  • ce11e658ff HIQDUCS-100 的处理 wangliwen 2022-10-17 13:09:46 +0800
  • 234732dea0 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev huangweixiong 2022-10-15 00:26:07 +0800
  • 6a50857c2e 升级shiro，阿里云暂时没有最新包 huangweixiong 2022-10-15 00:22:13 +0800
  • 79b86cb96c 亚威组织导出接口 huangweixiong 2022-10-15 00:21:28 +0800
  • 85d1e9eddf 设备申请新增设备详情字段 lizhicheng 2022-10-14 17:23:53 +0800
  • 64e53c3535 统计报表状态修改 lizhicheng 2022-10-14 14:57:46 +0800
  • 19844fdfc2 Merge branch 'master' into docker_package wangliwen 2022-10-14 11:27:06 +0800
  • a1fbce7737 Merge branch 'dev' wangliwen 2022-10-14 11:26:58 +0800
  • b1376f4646 发起人主动终止时 补充意见 wangliwen 2022-10-14 11:25:58 +0800
  • f80c31fc21 Merge branch 'master' into docker_package wangliwen 2022-10-14 11:15:12 +0800
  • 27b34d26c2 Merge branch 'dev' wangliwen 2022-10-14 11:15:04 +0800
  • 74523031c8 环境不一致，sql修改 dinggang 2022-10-13 23:43:55 +0800
  • 19db902082 Merge branch 'master' into docker_package wangliwen 2022-10-13 23:08:18 +0800
  • 4fdfb45b1c Merge branch 'dev' wangliwen 2022-10-13 23:08:11 +0800
  • e920447f39 Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-10-13 23:08:01 +0800
  • 2ca1096ecc 草泥马 wangliwen 2022-10-13 23:07:37 +0800
  • 227db45035 .. dinggang 2022-10-13 23:04:15 +0800
  • 24f1053ddd Merge branch 'master' into docker_package wangliwen 2022-10-13 22:57:17 +0800
  • 14768c994a Merge branch 'dev' wangliwen 2022-10-13 22:57:09 +0800
  • 7ca30e38c2 去掉 wangliwen 2022-10-13 22:56:49 +0800
  • 638630b57a Merge branch 'master' into docker_package wangliwen 2022-10-13 22:03:24 +0800
  • 339dd090fc Merge branch 'dev' wangliwen 2022-10-13 22:03:14 +0800
  • de5d3738d7 .. dinggang 2022-10-13 22:02:20 +0800
  • 033299353c Merge branch 'master' into docker_package wangliwen 2022-10-13 21:50:18 +0800
  • 096470457e Merge branch 'dev' wangliwen 2022-10-13 21:50:11 +0800
  • 88bbff3b8f 1.系统运行初始化数据调整 2.修复后台能力统计能力申请明细会议室申请状态错误bug dinggang 2022-10-13 21:47:31 +0800
  • 775195cad7 Merge branch 'master' into docker_package wangliwen 2022-10-13 21:32:24 +0800
  • 2b599faa4a Merge branch 'dev' wangliwen 2022-10-13 21:32:12 +0800
  • f3cb2206cb 调整 wangliwen 2022-10-13 21:32:01 +0800
  • 7a43f96c9a ... wangliwen 2022-10-13 21:21:38 +0800
  • 719484fad7 Merge branch 'dev' wangliwen 2022-10-13 20:58:20 +0800
  • 1373ab7088 。。。 wangliwen 2022-10-13 20:58:11 +0800
  • 88e00d54d8 Merge branch 'dev' wangliwen 2022-10-13 20:43:00 +0800
  • 0e3e460164 屮 wangliwen 2022-10-13 20:42:53 +0800
  • 2928c04e85 Merge branch 'dev' wangliwen 2022-10-13 20:34:56 +0800
  • c348b6d9eb 。。。 wangliwen 2022-10-13 20:34:49 +0800
  • 2673802567 Merge branch 'dev' wangliwen 2022-10-13 20:26:02 +0800
  • 127a4f7a56 。。。 wangliwen 2022-10-13 20:25:40 +0800
  • dd957414d8 Merge branch 'dev' wangliwen 2022-10-13 20:21:54 +0800
  • fa138f5b57 屮尼玛 wangliwen 2022-10-13 20:21:46 +0800
  • 0b9505136f Merge branch 'dev' wangliwen 2022-10-13 19:49:45 +0800
  • d67abf81a1 ... wangliwen 2022-10-13 19:49:34 +0800
  • 65112dc728 Merge branch 'dev' wangliwen 2022-10-13 17:52:03 +0800
  • 785276c635 Merge remote-tracking branch 'origin/dev' into dev dinggang 2022-10-13 17:50:47 +0800
  • 98a0715bf5 后台能力统计明细增加会议室申请 dinggang 2022-10-13 17:50:17 +0800
  • e0cd927455 Merge branch 'dev' wangliwen 2022-10-13 17:49:13 +0800
  • e98febf4c6 。。。 wangliwen 2022-10-13 17:49:06 +0800
  • 639e885225 Merge branch 'dev' wangliwen 2022-10-13 17:37:36 +0800
  • cd6c670a18 apply_amount 增加会客厅数量 wangliwen 2022-10-13 17:37:25 +0800
  • 244f5ed2e4 Merge branch 'dev' wangliwen 2022-10-13 17:06:38 +0800
  • c14fe24878 ... dinggang 2022-10-13 17:04:58 +0800
  • 156756bac2 Merge branch 'dev' wangliwen 2022-10-13 16:52:22 +0800
  • 433d353d4f sql文件命名冲突 dinggang 2022-10-13 16:51:45 +0800
  • 208829c4f8 Merge branch 'dev' wangliwen 2022-10-13 16:45:37 +0800
  • c583280b35 1.修改前后台能力申请统计逻辑，加入会议室申请统计 2.赋能场景增加字段 dinggang 2022-10-13 16:44:46 +0800
  • e7dc109193 Merge branch 'dev' wangliwen 2022-10-13 14:50:34 +0800
  • b45316d33b 屮 wangliwen 2022-10-13 14:50:23 +0800
  • eb543c2695 Merge branch 'dev' wangliwen 2022-10-13 12:50:03 +0800
  • a6733814ae 。。。 wangliwen 2022-10-13 12:49:54 +0800
  • f8b0b44cb2 Merge branch 'dev' wangliwen 2022-10-13 11:57:11 +0800
  • b4cc23f323 屮 wangliwen 2022-10-13 11:57:03 +0800
  • eaa8dc4482 Merge branch 'dev' wangliwen 2022-10-13 11:49:29 +0800
  • 1b87f215f9 Merge remote-tracking branch 'origin/dev' into dev dinggang 2022-10-13 11:48:18 +0800
  • 9113da88bb 后台管理-能力统计新增会议室申请统计 dinggang 2022-10-13 11:47:42 +0800
  • e40428d48e Merge branch 'dev' wangliwen 2022-10-13 11:46:42 +0800
  • 9fdda47fcc Merge remote-tracking branch 'origin/dev' into dev wangliwen 2022-10-13 11:46:31 +0800
  • 8e4eac8030 tb_fuse_resource 字段调整 wangliwen 2022-10-13 11:46:24 +0800
  • 2467da9106 字段名修改 dinggang 2022-10-13 11:32:29 +0800
  • 4f37523519 1.融合服务新增各种资源数量字段 dinggang 2022-10-13 11:02:37 +0800
  • 3ecbda2a60 Merge branch 'dev' wangliwen 2022-10-13 10:44:31 +0800
  • 1e8d781ba5 selectResourceListByType 接口数量调整 wangliwen 2022-10-13 10:43:36 +0800
  • 6cc646b959 Merge branch 'dev' wangliwen 2022-10-13 10:17:56 +0800
  • 35b53fa901 文案调整 wangliwen 2022-10-13 10:17:44 +0800
  • 09998753b2 Merge remote-tracking branch 'origin/dev' wangliwen 2022-10-13 09:39:47 +0800
  • 02398a3641 1.同步sys_menu菜单 2.实现访客模式功能 dinggang 2022-10-13 09:37:24 +0800
  • 05b57f3340 Merge branch 'dev' wangliwen 2022-10-12 19:04:19 +0800
  • 7c763efbd6 ...增加资源所属部门名称 wangliwen 2022-10-12 19:04:09 +0800
  • 6623fe87fd Merge branch 'dev' wangliwen 2022-10-12 18:52:05 +0800
  • e6191ab72e 资源申请量去掉 基础设施数量 wangliwen 2022-10-12 18:51:19 +0800
  • 1362c2dcd3 Merge branch 'dev' wangliwen 2022-10-12 17:11:35 +0800