Commit Graph

  • 357971f23b 菜单增加 site 站点标识 字段 wangliwen 2022-10-12 17:11:04 +0800
  • 997edea1cd Merge branch 'dev' wangliwen 2022-10-12 16:20:42 +0800
  • da4fab24bc ... wangliwen 2022-10-12 16:20:32 +0800
  • 5c9a8a83d8 Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-10-12 16:18:57 +0800
  • 57c0e17208 Merge branch 'dev' wangliwen 2022-10-12 16:16:37 +0800
  • 48cccebdfd 通知文案调整 wangliwen 2022-10-12 16:15:51 +0800
  • 6e22e9929f 申请历史修改时长单位 lizhicheng 2022-10-12 16:08:58 +0800
  • 500b68d429 Merge branch 'dev' wangliwen 2022-10-12 15:57:33 +0800
  • 0c1a606dd4 增加我的待办各类型的待办数量 wangliwen 2022-10-12 15:57:18 +0800
  • 1a60f96ad8 Merge branch 'dev' wangliwen 2022-10-12 15:15:36 +0800
  • b19598a4cb Merge remote-tracking branch '备份/dev' into dev wangliwen 2022-10-12 15:15:28 +0800
  • 6e80f7cdaf 重复申请发送通知 wangliwen 2022-10-12 15:15:21 +0800
  • 57af11a4a0 基础设施去掉感知资源分类 lizhicheng 2022-10-12 11:19:00 +0800
  • d947510ebe Merge branch 'dev' wangliwen 2022-10-12 09:57:05 +0800
  • 6612b514c8 模型文案调整 wangliwen 2022-10-12 09:56:54 +0800
  • 388b8f67a0 Merge branch 'dev' wangliwen 2022-10-12 09:42:28 +0800
  • 5bff2763a9 审批详情——市级区市管理员——改为市级管理员 HIQDUCS-17 wangliwen 2022-10-12 09:42:18 +0800
  • 5fb69dc48c Merge branch 'dev' wangliwen 2022-10-11 19:59:21 +0800
  • 6857ccb90e npe wangliwen 2022-10-11 19:59:14 +0800
  • 8cb99adfc4 Merge branch 'dev' wangliwen 2022-10-11 19:48:14 +0800
  • bc4a0f6635 。。。 wangliwen 2022-10-11 19:48:06 +0800
  • 1634cb4aad Merge branch 'dev' wangliwen 2022-10-11 19:36:14 +0800
  • 2c40cace07 审批详情返回分配人的所属部门 wangliwen 2022-10-11 19:36:06 +0800
  • 55e85e86f0 Merge branch 'dev' wangliwen 2022-10-11 17:45:19 +0800
  • 50fed6862d 消息通知跳转完善 lizhicheng 2022-10-11 16:19:47 +0800
  • 894c5c0251 报表统计bug、会议室消息跳转 lizhicheng 2022-10-11 11:49:22 +0800
  • 7ab1ce6c77 Merge remote-tracking branch 'origin/dev' wangliwen 2022-10-10 14:13:06 +0800
  • e217f56ca9 修改能力统计页申请次数统计不一致问题 dinggang 2022-10-10 14:08:26 +0800
  • 21ac7f2991 Merge branch 'dev' wangliwen 2022-10-10 13:53:45 +0800
  • d62484ba62 会议室预约审批人角色改为会议室审核人,增加根据roleid查询所有userId的方法,会议室改为发送角色下的所有人 zhangzhikang 2022-10-10 10:50:52 +0800
  • 2538479e36 Merge branch 'dev' wangliwen 2022-10-10 10:16:36 +0800
  • 7169d9ee73 会议室预约审批人角色改为会议室审核人 zhangzhikang 2022-10-10 10:12:17 +0800
  • 53725af1b2 Merge branch 'dev' wangliwen 2022-10-10 09:50:47 +0800
  • f72463d3bf 部门审批人为发起人时 默认通过 wangliwen 2022-10-10 09:50:28 +0800
  • 1190beb8fe Merge branch 'dev' wangliwen 2022-10-09 18:09:24 +0800
  • bb9d5847bf 完善:西海岸申购车 lizhicheng 2022-10-09 17:20:03 +0800
  • 06b3086ae3 Merge branch 'dev' wangliwen 2022-10-09 10:45:40 +0800
  • 77aac95526 资源导入 wangliwen 2022-10-09 10:43:34 +0800
  • 286df76ec3 Merge branch 'dev' wangliwen 2022-10-09 09:01:38 +0800
  • 983b01af36 全局格式化 wangliwen 2022-10-09 09:01:27 +0800
  • ec4a84b581 Merge branch 'dev' wangliwen 2022-10-09 08:55:42 +0800
  • 00eace9698 西海岸新增:购物车添加与一键申请 lizhicheng 2022-10-08 19:03:01 +0800
  • 3096433c38 Merge branch 'dev' wangliwen 2022-10-08 10:55:13 +0800
  • a409420df3 ... wangliwen 2022-10-08 10:55:03 +0800
  • dca052dd59 Merge branch 'dev' wangliwen 2022-10-08 09:28:35 +0800
  • 332a2972e4 全局格式化代码 wangliwen 2022-10-08 09:28:24 +0800
  • 7396a0a595 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-04 22:11:22 +0800
  • 117c79eb0d 通知消息跳转bug fix 缺陷修复版本 release lizhicheng 2022-10-04 18:01:49 +0800
  • c645e0f177 新增功能:通知消息支持跳转 lizhicheng 2022-10-04 17:34:19 +0800
  • d2a26c959f Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-10-03 20:33:27 +0800
  • be042a94b0 统计报表新增:审批单号 lizhicheng 2022-10-03 16:06:42 +0800
  • 4a5ef24d0c 融合服务场景入口、首页资源统计、已办bug lizhicheng 2022-10-03 11:46:20 +0800
  • 68ecd853d1 Merge branch 'master' into docker_package wangliwen 2022-09-30 09:13:29 +0800
  • 7163b83c2a 新增功能:基础设施部门最大申请限制 lizhicheng 2022-09-29 23:01:27 +0800
  • 98f5b5519f Merge branch 'master' into docker_package wangliwen 2022-09-29 17:52:06 +0800
  • ea141edbfa 全局格式化代码 wangliwen 2022-09-29 17:51:37 +0800
  • 0259a0a1db Merge branch 'master' into docker_package wangliwen 2022-09-29 11:15:28 +0800
  • dc7821387c wangliwen 2022-09-29 11:15:14 +0800
  • 92138b1668 docker 镜像增加 HEALTHCHECK wangliwen 2022-09-29 10:38:25 +0800
  • bdac845f47 Merge branch 'master' into docker_package wangliwen 2022-09-29 09:26:11 +0800
  • 2f933627ff ... wangliwen 2022-09-29 09:25:57 +0800
  • 768e24d62a Merge branch 'master' into docker_package wangliwen 2022-09-28 09:39:43 +0800
  • 1af6d798ed 日志输出采用异步输出模式 wangliwen 2022-09-28 09:39:18 +0800
  • ff8ed49979 Merge branch 'master' into docker_package DESKTOP-VA9NQUP\liwen 2022-09-28 07:54:24 +0800
  • ae3556ac3e 西海岸v2申请流程修改 lizhicheng 2022-09-27 18:55:44 +0800
  • 0348efcb56 Merge branch 'master' into docker_package wangliwen 2022-09-27 17:27:29 +0800
  • 1eb11c53ee 设备审批增加筛选条件 lizhicheng 2022-09-27 16:43:20 +0800
  • 22eea4c2f5 bug fix lizhicheng 2022-09-27 16:10:42 +0800
  • c5aaeca724 Merge branch 'master' into docker_package wangliwen 2022-09-27 11:04:53 +0800
  • 3c0d9ab8b3 新增:申请过期时间 lizhicheng 2022-09-27 09:52:16 +0800
  • 1b7825b3d6 Merge branch 'master' into docker_package wangliwen 2022-09-26 17:16:07 +0800
  • 57f73108ea 所有流程流转增加当前流程节点 wangliwen 2022-09-26 17:15:52 +0800
  • 0a17e588eb Merge branch 'master' into docker_package wangliwen 2022-09-26 16:51:11 +0800
  • 3826cdae37 处理人 wangliwen 2022-09-26 16:50:59 +0800
  • c98509adc0 Merge branch 'master' into docker_package wangliwen 2022-09-26 16:39:55 +0800
  • 128653d837 wangliwen 2022-09-26 16:39:43 +0800
  • 16ee9172be Merge branch 'master' into docker_package wangliwen 2022-09-26 16:35:54 +0800
  • 950f3f3b6e ... wangliwen 2022-09-26 16:35:41 +0800
  • c67274cf51 Merge branch 'master' into docker_package wangliwen 2022-09-26 16:25:53 +0800
  • 21a56a4d26 ... wangliwen 2022-09-26 16:25:38 +0800
  • 736d815f68 Merge branch 'master' into docker_package wangliwen 2022-09-26 16:08:19 +0800
  • 0e4c61cda1 能力申请增加当前节点信息 wangliwen 2022-09-26 16:07:28 +0800
  • 48c80cb357 能力申请通知调整 wangliwen 2022-09-26 15:39:40 +0800
  • 84fc633381 Merge branch 'master' into docker_package wangliwen 2022-09-26 14:22:17 +0800
  • 5edf6803e9 ... wangliwen 2022-09-26 14:21:46 +0800
  • aaf7324d98 Merge branch 'master' into docker_package wangliwen 2022-09-23 18:04:36 +0800
  • c64c3b4278 统计报表修改 lizhicheng 2022-09-23 17:42:43 +0800
  • 8f497f7b29 Merge branch 'master' into docker_package wangliwen 2022-09-23 09:49:02 +0800
  • 4aab62391a 西海岸bug修复 lizhicheng 2022-09-23 09:17:41 +0800
  • e32725c2aa Merge branch 'master' into docker_package wangliwen 2022-09-22 09:16:45 +0800
  • 51682736e6 新增功能:无人机、单兵设备审批 lizhicheng 2022-09-21 21:57:38 +0800
  • b871304d86 Merge branch 'master' into docker_package wangliwen 2022-09-20 13:55:41 +0800
  • 98ae1d69bd 云脑群网关统计对接 lizhicheng 2022-09-20 13:05:08 +0800
  • c8589edb41 Merge branch 'master' into docker_package wangliwen 2022-09-20 10:36:30 +0800
  • ffa1ebc9f7 西海岸需求:通知消息体现资源 lizhicheng 2022-09-20 10:25:11 +0800
  • e90976b781 Merge branch 'master' into docker_package wangliwen 2022-09-19 11:49:20 +0800
  • 347961cbd2 ... wangliwen 2022-09-19 11:49:06 +0800
  • 2f4aeb75dc Merge branch 'master' into docker_package wangliwen 2022-09-19 11:06:29 +0800
  • 8b8d155bc2 /resource/selectAppList 接口增加参数 area wangliwen 2022-09-19 11:06:03 +0800
  • f5118dc89c Merge branch 'master' into docker_package wangliwen 2022-09-16 14:35:46 +0800