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

2079 Commits

Author SHA1 Message Date
wangliwen 468c71b304 屮 2022-10-31 16:47:16 +08:00
wangliwen 9b8d25b1fa Merge branch 'master' into docker_package 2022-10-31 16:35:46 +08:00
wangliwen f7fe8fb7a5 Merge branch 'dev' 2022-10-31 16:35:39 +08:00
wangliwen 9d832a0955 Merge remote-tracking branch 'origin/dev' into dev 2022-10-31 16:35:29 +08:00
wangliwen ca652464d9 配置是否发送亚微消息 2022-10-31 16:35:21 +08:00
dinggang 6375d433c6 1.能力使用申请应用系统查询增加查询自己部门上架应用限制 
2.能力使用统计时间错误bug
3.部门列表查询bug修复
 2022-10-31 16:16:14 +08:00
wangliwen ec98e97064 Merge branch 'master' into docker_package 2022-10-31 14:57:48 +08:00
wangliwen 3ddd730000 Merge branch 'dev' 2022-10-31 14:57:36 +08:00
lizhicheng ddd1c3196a 部门分页、url前缀改为ucs-admin 2022-10-31 14:55:36 +08:00
wangliwen e42d997ce3 Merge branch 'master' into docker_package 2022-10-31 13:50:00 +08:00
wangliwen b7d81a8558 Merge branch 'dev' 2022-10-31 13:49:53 +08:00
wangliwen fd7b66bba9 区域部门管理员只出本区域部门信息 2022-10-31 13:49:45 +08:00
wangliwen d5a0c354b9 Merge branch 'master' into docker_package 2022-10-31 12:52:34 +08:00
wangliwen a06044a8ba Merge branch 'dev' 2022-10-31 12:52:27 +08:00
wangliwen 2af6dfc830 ... 2022-10-31 12:52:18 +08:00
wangliwen 4f3812b740 Merge branch 'master' into docker_package 2022-10-31 11:42:14 +08:00
wangliwen f9cce65adc Merge branch 'dev' 2022-10-31 11:42:07 +08:00
wangliwen a16c129c51 ... 2022-10-31 11:41:58 +08:00
wangliwen 5f8909b84e Merge branch 'master' into docker_package 2022-10-31 11:08:20 +08:00
wangliwen f9bbd078c4 Merge branch 'dev' 2022-10-31 11:08:12 +08:00
wangliwen 1be6e6d2bd npe 2022-10-31 11:08:04 +08:00
wangliwen a640fca271 Merge branch 'master' into docker_package 2022-10-31 10:47:56 +08:00
wangliwen 215090891f Merge branch 'dev' 2022-10-31 10:47:48 +08:00
wangliwen ceb3a5ec67 ... 2022-10-31 10:47:40 +08:00
wangliwen 7bb2763150 Merge branch 'master' into docker_package 2022-10-31 10:43:35 +08:00
wangliwen b92b96bbe1 Merge branch 'dev' 2022-10-31 10:42:17 +08:00
wangliwen f59eb5471f 区域管理员只出本区域 2022-10-31 10:42:07 +08:00
wangliwen 7884d2dcc4 Merge branch 'master' into docker_package 2022-10-31 10:06:27 +08:00
wangliwen 80a0aa8325 Merge branch 'dev' 2022-10-31 10:06:14 +08:00
wangliwen 1d70c445e6 用户管理导出数据不正确的处理 2022-10-31 10:05:52 +08:00
wangliwen 48abe30209 Merge branch 'master' into docker_package 2022-10-29 15:14:43 +08:00
wangliwen 79bb951644 Merge branch 'dev' 2022-10-29 15:14:36 +08:00
wangliwen d2d2c70801 。。。 2022-10-29 15:14:26 +08:00
wangliwen a740056eba Merge branch 'master' into docker_package 2022-10-29 14:38:24 +08:00
wangliwen 9058284498 Merge branch 'dev' 2022-10-29 14:38:17 +08:00
wangliwen f52aa25280 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-10-29 14:38:04 +08:00
wangliwen 433795f307 Merge branch 'master' into docker_package 2022-10-29 14:37:54 +08:00
wangliwen ff8111b679 Merge branch 'dev' 2022-10-29 14:37:47 +08:00
wangliwen cf7dc6b2de 字典内容启用禁用状态 2022-10-29 14:36:53 +08:00
huangweixiong cb353085b5 Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev 
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
  500
  字典类型内也返回对应字典值
  bug fix
  消息通知接口优化
  ...
  能力统计增加企业部门信息
  能力申请被拒绝时 删除申请记录 del_flg 置1
  1.门户首页基础设施统计会客厅数量错误修复
  npe
  npe
  ...
  pageWithAttrs 非中文数量不正确的处理
  我的待办列表 增加会议室
  屮
 2022-10-29 14:26:52 +08:00
huangweixiong 4be4d1e19c 通知格式添加能力需求 2022-10-29 14:26:47 +08:00
wangliwen d581de1115 Merge branch 'master' into docker_package 2022-10-29 11:07:40 +08:00
wangliwen 58571833ab Merge branch 'dev' 2022-10-29 11:07:31 +08:00
wangliwen 105047f346 500 2022-10-29 11:07:23 +08:00
wangliwen 6a16440840 Merge branch 'master' into docker_package 2022-10-29 10:51:00 +08:00
wangliwen 7c205644f4 Merge branch 'dev' 2022-10-29 10:50:52 +08:00
wangliwen b15402adad 字典类型内也返回对应字典值 2022-10-29 10:50:43 +08:00
wangliwen e221f008b0 Merge branch 'master' into docker_package 2022-10-28 18:07:38 +08:00
wangliwen cb9c3a598f Merge branch 'dev' 2022-10-28 18:07:30 +08:00
lizhicheng 23bd3c44a0 bug fix 2022-10-28 17:29:21 +08:00
lizhicheng 17f09a69f1 消息通知接口优化 2022-10-28 17:17:31 +08:00
wangliwen fdf8e02f0f Merge branch 'master' into docker_package 2022-10-28 15:00:31 +08:00
wangliwen cbbd57e410 Merge branch 'dev' 2022-10-28 15:00:23 +08:00
wangliwen ba520a439a ... 2022-10-28 15:00:14 +08:00
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