Commit Graph

2578 Commits

Author SHA1 Message Date
wangliwen 20007761eb 能力申请全为免批资源时,流程节点默认审核通过 2022-07-19 18:05:31 +08:00
yitonglei 2c708e1204 1、 修改flyway 4.0语句 2022-07-19 17:48:20 +08:00
yitonglei 6da7fa0665 1、同步摄像头标签信息时数据库配置增加默认值 2022-07-19 16:59:48 +08:00
wangliwen dbd4164e4c Merge branch 'master' into docker_package 2022-07-19 16:52:57 +08:00
wangliwen 6954af5ba4 deal with 2022-07-19 16:52:40 +08:00
wangliwen 58ba499f79 。。。 2022-07-19 16:47:13 +08:00
wangliwen 62231a0d92 Merge branch 'master' into docker_package 2022-07-19 16:24:52 +08:00
wangliwen 0cd5c87689 2022-07-19 16:24:16 +08:00
wangliwen c3c4a8025b dev环境配置文件调整 2022-07-19 16:03:43 +08:00
wangliwen ef86c15598 Merge branch 'master' into docker_package 2022-07-19 15:53:29 +08:00
yitonglei e98a470d7e 1、增加同步视频摄像头标签--配置文件 2022-07-19 15:51:15 +08:00
wangliwen dc62d53ca5 Merge branch 'master' into docker_package 2022-07-19 15:42:32 +08:00
yitonglei 561c481949 1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息 2022-07-19 15:30:44 +08:00
wangliwen c9137ee369 Merge branch 'master' into docker_package 2022-07-19 15:07:29 +08:00
wangliwen df7e2a3824 deptToDoTaskPage接口优化 2022-07-19 15:06:38 +08:00
wangliwen cbc0018a36 Merge branch 'master' into docker_package 2022-07-19 13:59:24 +08:00
dinggang b843f76d0f ... 2022-07-19 13:57:37 +08:00
wangliwen bbedac70f0 Merge branch 'dev' into docker_package 2022-07-19 13:42:10 +08:00
wangliwen 2ff63afa00 ... 2022-07-19 13:41:52 +08:00
wangliwen 1749b66ed9 Merge branch 'master' into docker_package 2022-07-19 13:38:10 +08:00
yitonglei 75a51451fb 1、去掉所有t_camera_channel01和t_camera_organization02的后缀。并添加sql版本为t_camera_channel和t_camera_organization增加字段 2022-07-19 12:03:05 +08:00
wangliwen 75e84b35d9 Merge branch 'master' into docker_package 2022-07-19 11:46:08 +08:00
yitonglei b3e4b77447 1、修改个人中心-我的浏览接口 2022-07-19 11:19:05 +08:00
wangliwen b38653e2c5 Merge branch 'dev' into docker_package 2022-07-19 11:06:31 +08:00
dinggang b23afc8029 1.编目更新
2.后台管理-工作台-部门待办新增用户名称
2022-07-19 10:58:30 +08:00
dinggang de822a40ae Merge remote-tracking branch 'origin/dev' into dev 2022-07-19 10:37:00 +08:00
dinggang 4e6e9cdd42 谨记 2022-07-19 10:36:24 +08:00
wangliwen 32ce62afeb Merge branch 'dev' into docker_package 2022-07-19 10:35:07 +08:00
wangliwen 18dad09f8f 调整sql 2022-07-19 10:34:58 +08:00
wangliwen 93766456dc Merge branch 'dev' into docker_package 2022-07-19 09:56:40 +08:00
wangliwen fdf7922d9b 。。 2022-07-19 09:56:32 +08:00
wangliwen ee2e372c1f Merge branch 'dev' into docker_package 2022-07-19 09:53:52 +08:00
wangliwen 916aef738c 分页不传ended时的处理 2022-07-19 09:53:44 +08:00
wangliwen 359df7a17b Merge branch 'master' into docker_package 2022-07-19 09:26:55 +08:00
wangliwen 56e20ef9ae ... 2022-07-19 09:26:39 +08:00
wangliwen 409b0b3b9b Merge branch 'master' into docker_package 2022-07-19 09:04:47 +08:00
huangweixiong 9b94a3b913 我的配置修改 2022-07-18 20:51:11 +08:00
huangweixiong f6fb190ade Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  。。。屮
  门户首页-热门能力筛选去除赋能案例
  审核状态不正确的处理
  拆单内流程是否完成
  屮
  1.编目和字典表初始化数据sql 2.bugfix
  。。。
  批量申请异步处理
  。。。
  资源所属部门为空时的处理
  ...
  fix bug
  批量进行所有应用资源
  排除特殊项目配置
2022-07-18 20:49:30 +08:00
huangweixiong 7dce8c0326 按部门申请网关 2022-07-18 20:48:59 +08:00
wangliwen 480fdec445 Merge branch 'master' into docker_package 2022-07-18 18:53:10 +08:00
wangliwen 3bd433fc1c Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-18 18:52:50 +08:00
wangliwen 46576aa4fa Merge branch 'dev' into docker_package 2022-07-18 18:52:12 +08:00
wangliwen 236162b861 。。。屮 2022-07-18 18:51:59 +08:00
dinggang c8afb955a1 门户首页-热门能力筛选去除赋能案例 2022-07-18 18:39:47 +08:00
wangliwen beb8fc93d9 Merge branch 'master' into docker_package 2022-07-18 18:29:21 +08:00
wangliwen 56fa006d82 审核状态不正确的处理 2022-07-18 18:28:25 +08:00
wangliwen ac3622a039 Merge branch 'master' into docker_package 2022-07-18 18:16:56 +08:00
wangliwen a503a961e0 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-07-18 18:16:26 +08:00
wangliwen fd02f8ea2d Merge branch 'master' into docker_package 2022-07-18 18:15:05 +08:00
wangliwen fe35973785 拆单内流程是否完成 2022-07-18 18:11:03 +08:00