wangliwen
|
08960eebeb
|
Merge branch 'master' into docker_package
|
2022-11-24 18:00:02 +08:00 |
|
wangliwen
|
0909f09bac
|
Merge branch 'dev'
|
2022-11-24 17:59:54 +08:00 |
 dinggang
|
6fa748b834
|
统计删除知识库数据
|
2022-11-24 17:59:14 +08:00 |
|
wangliwen
|
54219dafdb
|
Merge branch 'master' into docker_package
|
2022-11-24 09:05:57 +08:00 |
|
wangliwen
|
477064167c
|
Merge branch 'dev'
|
2022-11-24 09:05:40 +08:00 |
|
dinggang
|
6dbe768720
|
统计小数位数保留错误问题
|
2022-11-23 18:25:14 +08:00 |
|
wangliwen
|
1492eea81e
|
Merge branch 'master' into docker_package
|
2022-11-23 17:49:07 +08:00 |
|
wangliwen
|
91da0ab040
|
Merge branch 'dev'
|
2022-11-23 17:48:58 +08:00 |
|
dinggang
|
4ffae6f944
|
1.资金报表增加申请状态
|
2022-11-23 17:47:35 +08:00 |
|
wangliwen
|
b278681f47
|
Merge branch 'master' into docker_package
|
2022-11-23 17:02:26 +08:00 |
|
wangliwen
|
35ff5a2acc
|
Merge branch 'dev'
|
2022-11-23 17:02:18 +08:00 |
|
dinggang
|
e7b8188f36
|
.
|
2022-11-23 16:33:05 +08:00 |
|
dinggang
|
3bdec35655
|
1.资金报表新增按审核状态查询条件
2.能力统计-能力使用统计明细增加按提供部门查询
|
2022-11-23 16:32:35 +08:00 |
|
dinggang
|
c94f0513b4
|
。。。
|
2022-11-23 09:41:56 +08:00 |
|
wangliwen
|
b7cd32884a
|
Merge branch 'master' into docker_package
|
2022-11-23 09:18:21 +08:00 |
|
wangliwen
|
f4ee5ebd0e
|
Merge branch 'dev'
|
2022-11-23 09:18:14 +08:00 |
|
dinggang
|
e8d2ea9df7
|
统计错误修复
|
2022-11-23 09:12:52 +08:00 |
|
dinggang
|
9a440727f9
|
npe
|
2022-11-22 17:55:23 +08:00 |
|
dinggang
|
1ac9bdd772
|
申请时增加价格字段
|
2022-11-22 17:23:45 +08:00 |
|
dinggang
|
7eac8dd1c2
|
1.资源重复申请判断逻辑修改
2.新增资金报表需求
3.西海岸已申请列表需求
|
2022-11-22 17:01:31 +08:00 |
|
wangliwen
|
8affc98b49
|
Merge branch 'master' into docker_package
|
2022-11-22 13:37:47 +08:00 |
|
wangliwen
|
2c0feef452
|
Merge branch 'dev'
|
2022-11-22 13:37:36 +08:00 |
|
wangliwen
|
86047d380f
|
Merge branch 'master' into docker_package
|
2022-11-22 13:36:47 +08:00 |
|
wangliwen
|
43d202fcf5
|
Merge branch 'dev'
|
2022-11-22 13:36:39 +08:00 |
|
dinggang
|
16c77f7686
|
1.sql文件命名错误修改
|
2022-11-21 18:31:11 +08:00 |
|
dinggang
|
ffa2e6d93e
|
1.西海岸-已申请列表查询
2.token过期时间改为可配置
3.亚伟通知消息bug修复
|
2022-11-21 17:58:19 +08:00 |
|
dinggang
|
8573da35eb
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-11-21 10:04:47 +08:00 |
|
dinggang
|
d891593c4b
|
西海岸基础设施新需求-待申请列表增删改查接口
已申请查询，删除接口
超级管理员删除能力数据未删除下架流程相关数据bug修复
|
2022-11-21 09:39:24 +08:00 |
|
dinggang
|
d0682ef97d
|
金宏版本不支持，想其他办法
|
2022-11-18 18:49:49 +08:00 |
|
wangliwen
|
2150646da0
|
Merge branch 'master' into docker_package
|
2022-11-18 13:06:23 +08:00 |
|
wangliwen
|
bd46f31eac
|
Merge branch 'dev'
|
2022-11-18 13:06:13 +08:00 |
|
wangliwen
|
d3b3c4181f
|
政务云增加 类型 查询
|
2022-11-18 13:06:05 +08:00 |
|
wangliwen
|
7d74fa9b4a
|
Merge branch 'master' into docker_package
|
2022-11-18 12:41:59 +08:00 |
|
wangliwen
|
88ef8c1e36
|
Merge branch 'dev'
|
2022-11-18 12:41:52 +08:00 |
|
wangliwen
|
5668ae110d
|
...
|
2022-11-18 12:41:45 +08:00 |
|
wangliwen
|
bb81e6f631
|
Merge branch 'master' into docker_package
|
2022-11-18 11:12:38 +08:00 |
|
wangliwen
|
04e8e01ec4
|
Merge branch 'dev'
|
2022-11-18 11:12:31 +08:00 |
|
wangliwen
|
89de07eac0
|
政务云服务资源 本地数据接口
|
2022-11-18 11:12:12 +08:00 |
|
wangliwen
|
057fab005d
|
Merge branch 'master' into docker_package
|
2022-11-18 08:59:31 +08:00 |
|
wangliwen
|
22600ddedc
|
Merge branch 'dev'
|
2022-11-18 08:59:22 +08:00 |
|
dinggang
|
5e403b6ae6
|
后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门
|
2022-11-17 14:52:55 +08:00 |
|
wangliwen
|
8f15539330
|
Merge branch 'master' into docker_package
|
2022-11-16 19:05:06 +08:00 |
|
wangliwen
|
09274487bd
|
Merge remote-tracking branch 'origin/dev'
|
2022-11-16 19:04:35 +08:00 |
|
dinggang
|
7e54dcebba
|
漏提了...
|
2022-11-15 16:52:20 +08:00 |
|
dinggang
|
acdcf5b25c
|
1.增加允许账号多地同时在线功能
2.去除无用注入
3.云资源和云视频调用失败异常处理
4.菜单管理新增按名称模糊查询
5.同步字典表新增数据
|
2022-11-15 16:50:24 +08:00 |
|
wangliwen
|
eb3bf1d96d
|
Merge branch 'master' into docker_package
|
2022-11-15 15:33:59 +08:00 |
|
wangliwen
|
e572bd54fc
|
Merge branch 'dev'
|
2022-11-15 15:33:51 +08:00 |
|
wangliwen
|
3199f917e7
|
后台能力统计部门级别排序调节 所有部门接口
|
2022-11-15 15:33:39 +08:00 |
|
wangliwen
|
1eaa67a531
|
Merge branch 'master' into docker_package
|
2022-11-14 18:03:00 +08:00 |
|
wangliwen
|
c2af9bb8fc
|
Merge branch 'dev'
|
2022-11-14 18:02:54 +08:00 |