 dinggang
|
8342c4b978
|
sql修改
|
2022-11-25 16:45:11 +08:00 |
wangliwen
|
f6a4a323c4
|
Merge branch 'master' into docker_package
|
2022-11-25 16:25:16 +08:00 |
|
wangliwen
|
5b5bf2f3c7
|
Merge branch 'dev'
|
2022-11-25 16:25:01 +08:00 |
 huangweixiong
|
efaba0980d
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform: (22 commits)
1.新增查询部门及区市未配置审核人员列表接口 2.角色用户关联表新增修改时间，修改人及删除标志字段 3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除 4.调整其他设计用户角色关联表查询sql，增加删除标志条件
能力使用导出表头调整
统计删除知识库数据
统计小数位数保留错误问题
1.资金报表增加申请状态
.
1.资金报表新增按审核状态查询条件 2.能力统计-能力使用统计明细增加按提供部门查询
。。。
统计错误修复
npe
申请时增加价格字段
1.资源重复申请判断逻辑修改 2.新增资金报表需求 3.西海岸已申请列表需求
1.sql文件命名错误修改
1.西海岸-已申请列表查询 2.token过期时间改为可配置 3.亚伟通知消息bug修复
西海岸基础设施新需求-待申请列表增删改查接口 已申请查询，删除接口 超级管理员删除能力数据未删除下架流程相关数据bug修复
金宏版本不支持，想其他办法
政务云增加 类型 查询
...
政务云服务资源 本地数据接口
后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门
...
|
2022-11-25 16:23:32 +08:00 |
|
huangweixiong
|
b5cb7d8441
|
去掉后台写cookie
|
2022-11-25 16:22:44 +08:00 |
|
dinggang
|
0d3d6f61ec
|
1.新增查询部门及区市未配置审核人员列表接口
2.角色用户关联表新增修改时间，修改人及删除标志字段
3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除
4.调整其他设计用户角色关联表查询sql，增加删除标志条件
|
2022-11-25 14:30:52 +08:00 |
|
wangliwen
|
06a3e0c478
|
Merge branch 'master' into docker_package
|
2022-11-25 09:48:39 +08:00 |
|
wangliwen
|
ca8713ab50
|
Merge branch 'dev'
|
2022-11-25 09:48:31 +08:00 |
|
wangliwen
|
02d01ad170
|
能力使用导出表头调整
|
2022-11-25 09:48:19 +08:00 |
|
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 |
|
wangliwen
|
e644199843
|
...
|
2022-11-14 18:02:46 +08:00 |
|
wangliwen
|
ec59951c81
|
Merge branch 'master' into docker_package
|
2022-11-14 17:19:51 +08:00 |
|
wangliwen
|
88acd9814d
|
Merge branch 'dev'
|
2022-11-14 17:19:45 +08:00 |
|
dinggang
|
68c88a10f7
|
1.关于登录的新增配置
|
2022-11-14 17:18:16 +08:00 |
|
dinggang
|
0bf4b305c2
|
1.关于登录的新增配置
|
2022-11-14 17:17:07 +08:00 |
|
wangliwen
|
b4c2c261c4
|
Merge branch 'master' into docker_package
|
2022-11-14 17:06:27 +08:00 |
|
wangliwen
|
d0c84a5c1a
|
Merge branch 'dev'
|
2022-11-14 17:06:20 +08:00 |
|
dinggang
|
c844000ff1
|
1.用户表新增字段
|
2022-11-14 17:02:14 +08:00 |
|
dinggang
|
a14ba472eb
|
1.第三方检测问题修复-登录时用户信息明文传输
2.第三方检测问题修复-未对用户登录次数进行限制
|
2022-11-14 16:29:00 +08:00 |
|
wangliwen
|
da9b058e65
|
Merge branch 'master' into docker_package
|
2022-11-14 14:37:11 +08:00 |
|
wangliwen
|
d19fad286a
|
Merge branch 'dev'
|
2022-11-14 14:37:04 +08:00 |
|
dinggang
|
7f224cf1a3
|
用户账号状态枚举新增锁定状态
|
2022-11-14 10:05:34 +08:00 |
|
dinggang
|
1ee2482cb3
|
用户表新增字段-密码错误次数
|
2022-11-14 10:04:44 +08:00 |
|
wangliwen
|
d14605826a
|
Merge branch 'master' into docker_package
|
2022-11-11 17:14:53 +08:00 |
|
wangliwen
|
0943e68d21
|
Merge branch 'dev'
|
2022-11-11 17:14:45 +08:00 |
|
huangweixiong
|
09becdf80d
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
。。。
|
2022-11-11 14:18:29 +08:00 |
|
huangweixiong
|
35fe09a3e4
|
添加山东通单点登录
|
2022-11-11 14:18:14 +08:00 |
|
wangliwen
|
df8e6c836c
|
Merge branch 'master' into docker_package
|
2022-11-11 13:47:43 +08:00 |
|
wangliwen
|
2cd626ddda
|
Merge branch 'dev'
|
2022-11-11 13:47:34 +08:00 |
|
wangliwen
|
547c128b2c
|
。。。
|
2022-11-11 13:47:25 +08:00 |
|
huangweixiong
|
4ed920651a
|
Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev
* 'dev' of http://192.168.124.50/wangliwen/share-platform:
全局resttemp配置项
调整亚微的详情接口
1.对接政务云资源和云视频列表查询接口 2.全局搜索会客厅统计错误bug修复
运行日志文件按时间逆序，下载运行日志无需认证
...
屮
。。。
调整上传限制大小
1.我的收藏列表查询增加融合服务查询 2.增加超级管理员删除能力和流程实例接口 3.删除区划标识修改
yawei待办详情
...
导出失败的处理
...
jira上的bug
|
2022-11-11 09:50:45 +08:00 |
|
huangweixiong
|
2760c891e8
|
山东通单点登录
|
2022-11-11 09:50:19 +08:00 |
|
wangliwen
|
d67727e5a4
|
Merge branch 'master' into docker_package
|
2022-11-11 09:25:48 +08:00 |
|
wangliwen
|
eb09e240ab
|
Merge branch 'dev'
|
2022-11-11 09:25:40 +08:00 |
|
wangliwen
|
718689b223
|
全局resttemp配置项
|
2022-11-11 09:25:32 +08:00 |
|
wangliwen
|
376eb698f6
|
Merge branch 'master' into docker_package
|
2022-11-10 15:26:18 +08:00 |
|
wangliwen
|
3bcb645b9c
|
Merge branch 'dev'
|
2022-11-10 15:26:11 +08:00 |
|
wangliwen
|
20dbf5753a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-11-10 15:25:59 +08:00 |
|
wangliwen
|
2f6c020f05
|
Merge branch 'master' into docker_package
|
2022-11-10 15:24:54 +08:00 |
|
wangliwen
|
e2a937810e
|
Merge branch 'dev'
|
2022-11-10 15:24:46 +08:00 |
|
wangliwen
|
951b251e21
|
调整亚微的详情接口
|
2022-11-10 15:24:37 +08:00 |
|
dinggang
|
dff21f73e8
|
1.对接政务云资源和云视频列表查询接口
2.全局搜索会客厅统计错误bug修复
|
2022-11-10 15:22:57 +08:00 |
|
wangliwen
|
83a24ecc8c
|
Merge branch 'master' into docker_package
|
2022-11-10 09:16:57 +08:00 |
|
wangliwen
|
02592e7b72
|
Merge branch 'dev'
|
2022-11-10 09:16:41 +08:00 |
|
wangliwen
|
89355fd5ec
|
运行日志文件按时间逆序，下载运行日志无需认证
|
2022-11-10 09:16:31 +08:00 |
|
wangliwen
|
c0764c71a2
|
Merge branch 'master' into docker_package
|
2022-11-09 16:54:03 +08:00 |
|
wangliwen
|
351667b4c1
|
Merge branch 'dev'
|
2022-11-09 16:53:57 +08:00 |
|
wangliwen
|
9fe3d20864
|
...
|
2022-11-09 16:53:49 +08:00 |
|
wangliwen
|
1e07f6ac86
|
Merge branch 'master' into docker_package
|
2022-11-09 16:39:37 +08:00 |
|
wangliwen
|
2523cb139b
|
Merge branch 'dev'
|
2022-11-09 16:39:30 +08:00 |
|
wangliwen
|
0b27181f37
|
屮
|
2022-11-09 16:39:08 +08:00 |