wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 3f2b29999c Merge branch 'master' into docker_package wangliwen 2022-11-29 13:17:43 +0800
  • e4b3caeb0c Merge branch 'dev' wangliwen 2022-11-29 13:17:35 +0800
  • 476b88a806 统计修改 sql错误修复 dinggang 2022-11-29 13:16:12 +0800
  • 9a4a9c4ac3 Merge branch 'master' into docker_package wangliwen 2022-11-29 08:58:39 +0800
  • 2719a1aa6c Merge branch 'dev' wangliwen 2022-11-29 08:58:28 +0800
  • 2d152dd94d .. dinggang 2022-11-29 08:57:32 +0800
  • 41a9aec6da Merge branch 'master' into docker_package wangliwen 2022-11-29 08:57:11 +0800
  • cfe4c79d5e Merge branch 'dev' wangliwen 2022-11-29 08:57:04 +0800
  • f1f52f158a Merge branch 'master' into docker_package wangliwen 2022-11-29 08:56:23 +0800
  • baceca0471 Merge branch 'dev' wangliwen 2022-11-29 08:56:15 +0800
  • 6c82631bf9 . dinggang 2022-11-28 19:11:57 +0800
  • 624140d67a 统计错误修复 用户表增加索引 dinggang 2022-11-28 19:10:38 +0800
  • 85e3c58cf8 金额转为万元 dinggang 2022-11-28 16:47:25 +0800
  • 246494c9cf . dinggang 2022-11-28 11:19:44 +0800
  • 3ef710afc9 Merge branch 'master' into docker_package wangliwen 2022-11-28 10:58:48 +0800
  • a789733f6a Merge branch 'dev' wangliwen 2022-11-28 10:58:41 +0800
  • fc6aa27ad4 西海岸bug dinggang 2022-11-28 10:15:27 +0800
  • 27be87fc5b Merge branch 'master' into docker_package wangliwen 2022-11-28 09:37:31 +0800
  • bd3cb9eb40 Merge branch 'dev' wangliwen 2022-11-28 09:37:22 +0800
  • d2c3f885ed sql修改 dinggang 2022-11-28 09:36:44 +0800
  • 7b70e3f969 Merge branch 'master' into docker_package wangliwen 2022-11-28 09:03:21 +0800
  • e74212ea27 Merge branch 'dev' wangliwen 2022-11-28 09:03:12 +0800
  • 76780e2eda 1.重复申请判断逻辑错误，暂时改回原逻辑 2.资金报表大屏相关接口 dinggang 2022-11-26 18:07:39 +0800
  • 5e08c5600a Merge branch 'master' into docker_package wangliwen 2022-11-25 17:16:27 +0800
  • 1fcde01778 Merge branch 'dev' wangliwen 2022-11-25 17:16:18 +0800
  • e64b5952ca Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev dinggang 2022-11-25 16:45:31 +0800
  • 8342c4b978 sql修改 dinggang 2022-11-25 16:45:11 +0800
  • f6a4a323c4 Merge branch 'master' into docker_package wangliwen 2022-11-25 16:25:16 +0800
  • 5b5bf2f3c7 Merge branch 'dev' wangliwen 2022-11-25 16:25:01 +0800
  • efaba0980d Merge branch 'dev' of http://192.168.124.50/wangliwen/share-platform into dev huangweixiong 2022-11-25 16:23:32 +0800
  • b5cb7d8441 去掉后台写cookie huangweixiong 2022-11-25 16:22:44 +0800
  • 0d3d6f61ec 1.新增查询部门及区市未配置审核人员列表接口 2.角色用户关联表新增修改时间，修改人及删除标志字段 3.修改用户数据变更时角色信息修改逻辑，关联数据由物理删除变为逻辑删除 4.调整其他设计用户角色关联表查询sql，增加删除标志条件 dinggang 2022-11-25 14:30:52 +0800
  • 06a3e0c478 Merge branch 'master' into docker_package wangliwen 2022-11-25 09:48:39 +0800
  • ca8713ab50 Merge branch 'dev' wangliwen 2022-11-25 09:48:31 +0800
  • 02d01ad170 能力使用导出表头调整 wangliwen 2022-11-25 09:48:19 +0800
  • 08960eebeb Merge branch 'master' into docker_package wangliwen 2022-11-24 18:00:02 +0800
  • 0909f09bac Merge branch 'dev' wangliwen 2022-11-24 17:59:54 +0800
  • 6fa748b834 统计删除知识库数据 dinggang 2022-11-24 17:59:14 +0800
  • 54219dafdb Merge branch 'master' into docker_package wangliwen 2022-11-24 09:05:57 +0800
  • 477064167c Merge branch 'dev' wangliwen 2022-11-24 09:05:40 +0800
  • 6dbe768720 统计小数位数保留错误问题 dinggang 2022-11-23 18:25:14 +0800
  • 1492eea81e Merge branch 'master' into docker_package wangliwen 2022-11-23 17:49:07 +0800
  • 91da0ab040 Merge branch 'dev' wangliwen 2022-11-23 17:48:58 +0800
  • 4ffae6f944 1.资金报表增加申请状态 dinggang 2022-11-23 17:47:35 +0800
  • b278681f47 Merge branch 'master' into docker_package wangliwen 2022-11-23 17:02:26 +0800
  • 35ff5a2acc Merge branch 'dev' wangliwen 2022-11-23 17:02:18 +0800
  • e7b8188f36 . dinggang 2022-11-23 16:33:05 +0800
  • 3bdec35655 1.资金报表新增按审核状态查询条件 2.能力统计-能力使用统计明细增加按提供部门查询 dinggang 2022-11-23 16:32:35 +0800
  • c94f0513b4 。。。 dinggang 2022-11-23 09:41:56 +0800
  • b7cd32884a Merge branch 'master' into docker_package wangliwen 2022-11-23 09:18:21 +0800
  • f4ee5ebd0e Merge branch 'dev' wangliwen 2022-11-23 09:18:14 +0800
  • e8d2ea9df7 统计错误修复 dinggang 2022-11-23 09:12:52 +0800
  • 9a440727f9 npe dinggang 2022-11-22 17:55:23 +0800
  • 1ac9bdd772 申请时增加价格字段 dinggang 2022-11-22 17:23:45 +0800
  • 7eac8dd1c2 1.资源重复申请判断逻辑修改 2.新增资金报表需求 3.西海岸已申请列表需求 dinggang 2022-11-22 17:01:31 +0800
  • 8affc98b49 Merge branch 'master' into docker_package wangliwen 2022-11-22 13:37:47 +0800
  • 2c0feef452 Merge branch 'dev' wangliwen 2022-11-22 13:37:36 +0800
  • 86047d380f Merge branch 'master' into docker_package wangliwen 2022-11-22 13:36:47 +0800
  • 43d202fcf5 Merge branch 'dev' wangliwen 2022-11-22 13:36:39 +0800
  • 16c77f7686 1.sql文件命名错误修改 dinggang 2022-11-21 18:31:11 +0800
  • ffa2e6d93e 1.西海岸-已申请列表查询 2.token过期时间改为可配置 3.亚伟通知消息bug修复 dinggang 2022-11-21 17:58:19 +0800
  • 8573da35eb Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev dinggang 2022-11-21 10:04:47 +0800
  • d891593c4b 西海岸基础设施新需求-待申请列表增删改查接口 已申请查询，删除接口 超级管理员删除能力数据未删除下架流程相关数据bug修复 dinggang 2022-11-21 09:39:24 +0800
  • d0682ef97d 金宏版本不支持，想其他办法 dinggang 2022-11-18 18:49:49 +0800
  • 2150646da0 Merge branch 'master' into docker_package wangliwen 2022-11-18 13:06:23 +0800
  • bd46f31eac Merge branch 'dev' wangliwen 2022-11-18 13:06:13 +0800
  • d3b3c4181f 政务云增加 类型 查询 wangliwen 2022-11-18 13:06:05 +0800
  • 7d74fa9b4a Merge branch 'master' into docker_package wangliwen 2022-11-18 12:41:59 +0800
  • 88ef8c1e36 Merge branch 'dev' wangliwen 2022-11-18 12:41:52 +0800
  • 5668ae110d ... wangliwen 2022-11-18 12:41:45 +0800
  • bb81e6f631 Merge branch 'master' into docker_package wangliwen 2022-11-18 11:12:38 +0800
  • 04e8e01ec4 Merge branch 'dev' wangliwen 2022-11-18 11:12:31 +0800
  • 89de07eac0 政务云服务资源 本地数据接口 wangliwen 2022-11-18 11:12:12 +0800
  • 057fab005d Merge branch 'master' into docker_package wangliwen 2022-11-18 08:59:31 +0800
  • 22600ddedc Merge branch 'dev' wangliwen 2022-11-18 08:59:22 +0800
  • 5e403b6ae6 后台管理能力统计-能力使用统计查询申请部门列表接口修改-只查询有申请记录的部门 dinggang 2022-11-17 14:52:55 +0800
  • 8f15539330 Merge branch 'master' into docker_package wangliwen 2022-11-16 19:05:06 +0800
  • 09274487bd Merge remote-tracking branch 'origin/dev' wangliwen 2022-11-16 19:04:35 +0800
  • 7e54dcebba 漏提了... dinggang 2022-11-15 16:52:20 +0800
  • acdcf5b25c 1.增加允许账号多地同时在线功能 2.去除无用注入 3.云资源和云视频调用失败异常处理 4.菜单管理新增按名称模糊查询 5.同步字典表新增数据 dinggang 2022-11-15 16:50:24 +0800
  • eb3bf1d96d Merge branch 'master' into docker_package wangliwen 2022-11-15 15:33:59 +0800
  • e572bd54fc Merge branch 'dev' wangliwen 2022-11-15 15:33:51 +0800
  • 3199f917e7 后台能力统计部门级别排序调节 所有部门接口 wangliwen 2022-11-15 15:33:39 +0800
  • 1eaa67a531 Merge branch 'master' into docker_package wangliwen 2022-11-14 18:03:00 +0800
  • c2af9bb8fc Merge branch 'dev' wangliwen 2022-11-14 18:02:54 +0800
  • e644199843 ... wangliwen 2022-11-14 18:02:46 +0800
  • ec59951c81 Merge branch 'master' into docker_package wangliwen 2022-11-14 17:19:51 +0800
  • 88acd9814d Merge branch 'dev' wangliwen 2022-11-14 17:19:45 +0800
  • 68c88a10f7 1.关于登录的新增配置 dinggang 2022-11-14 17:18:16 +0800
  • 0bf4b305c2 1.关于登录的新增配置 dinggang 2022-11-14 17:17:07 +0800
  • b4c2c261c4 Merge branch 'master' into docker_package wangliwen 2022-11-14 17:06:27 +0800
  • d0c84a5c1a Merge branch 'dev' wangliwen 2022-11-14 17:06:20 +0800
  • c844000ff1 1.用户表新增字段 dinggang 2022-11-14 17:02:14 +0800
  • a14ba472eb 1.第三方检测问题修复-登录时用户信息明文传输 2.第三方检测问题修复-未对用户登录次数进行限制 dinggang 2022-11-14 16:29:00 +0800
  • da9b058e65 Merge branch 'master' into docker_package wangliwen 2022-11-14 14:37:11 +0800
  • d19fad286a Merge branch 'dev' wangliwen 2022-11-14 14:37:04 +0800
  • 7f224cf1a3 用户账号状态枚举新增锁定状态 dinggang 2022-11-14 10:05:34 +0800
  • 1ee2482cb3 用户表新增字段-密码错误次数 dinggang 2022-11-14 10:04:44 +0800
  • d14605826a Merge branch 'master' into docker_package wangliwen 2022-11-11 17:14:53 +0800
  • 0943e68d21 Merge branch 'dev' wangliwen 2022-11-11 17:14:45 +0800