Commit Graph

2359 Commits

Author SHA1 Message Date
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