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
|
968b309a43
|
Merge branch 'dev'
|
2022-10-27 17:54:21 +08:00 |
 lizhicheng
|
72947ca394
|
npe
|
2022-10-27 17:51:24 +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
|
de01721f5e
|
Merge branch 'dev'
|
2022-10-27 14:50:11 +08:00 |
|
wangliwen
|
0c88de3898
|
...
|
2022-10-27 14:50:01 +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
|
d557c98e5d
|
Merge branch 'dev'
|
2022-10-27 10:54:57 +08:00 |
|
wangliwen
|
f39b22751f
|
我的待办列表 增加会议室
|
2022-10-27 10:54:48 +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 |
|
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
|
b8c95f30f5
|
Merge branch 'dev'
|
2022-10-26 18:04:38 +08:00 |
|
lizhicheng
|
27d2f13fc5
|
统计报表去掉已下架、审批时间单位、增加恩科用户
|
2022-10-26 18:01:05 +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
|
59a15e2ce9
|
Merge branch 'dev'
|
2022-10-26 13:54:19 +08:00 |
|
wangliwen
|
b4db7eb6fc
|
审核人为默认时 允许转办
|
2022-10-26 13:54:04 +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
|
0a4172d1bf
|
Merge branch 'dev'
|
2022-10-26 10:34:20 +08:00 |
|
wangliwen
|
e836bcb271
|
全局搜索数量支持非中文
|
2022-10-26 10:34:11 +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 |
|
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
|
f643d4789a
|
Merge branch 'dev'
|
2022-10-25 15:04:42 +08:00 |
|
wangliwen
|
a6620a396a
|
查询区域管理员管理的部门 接口
|
2022-10-25 15:04:33 +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
|
38c1c913ab
|
Merge branch 'dev'
|
2022-10-25 13:40:05 +08:00 |
|
wangliwen
|
b4d5f8dea0
|
应用广场按应用领域搜索不正确的处理
|
2022-10-25 13:39:57 +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
|
ca2de25a26
|
Merge branch 'dev'
|
2022-10-25 10:05:24 +08:00 |
|
wangliwen
|
00b55a9c6b
|
能力统计增加区域参数
|
2022-10-25 10:05:13 +08:00 |
|
wangliwen
|
ab24e417bd
|
Merge branch 'dev'
|
2022-10-25 09:33:39 +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 |
|
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 |