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 |
|
wangliwen
|
e836bcb271
|
全局搜索数量支持非中文
|
2022-10-26 10:34:11 +08:00 |