Commit Graph

2574 Commits

Author SHA1 Message Date
wangliwen 59a94ed12e ... 2023-01-04 14:45:55 +08:00
wangliwen e53ac2d72a Merge branch 'dev' 2023-01-04 13:59:32 +08:00
wangliwen 0b1387cf5a ... 2023-01-04 13:59:25 +08:00
wangliwen 48747dc68d Merge branch 'dev' 2023-01-04 13:56:44 +08:00
wangliwen 9673b2d52a 赋能场景分页增加过滤接口 2023-01-04 13:55:58 +08:00
wangliwen 0ff8cbe7b1 Merge branch 'dev' 2023-01-04 11:41:21 +08:00
wangliwen 4286d50872 npe 2023-01-04 11:41:14 +08:00
wangliwen 790b9e98e5 Merge branch 'dev' 2023-01-04 11:22:02 +08:00
wangliwen 1b593637f3 周快照、月快照 2023-01-04 11:21:54 +08:00
wangliwen 53816fae1f Merge branch 'dev' 2023-01-04 10:19:05 +08:00
wangliwen da79eebf6c 补全空缺数据 2023-01-04 10:18:57 +08:00
wangliwen 6714446624 Merge branch 'dev' 2023-01-04 09:32:31 +08:00
wangliwen 2b4e9e9f47 配置是否需要统计云资源 2023-01-04 09:32:23 +08:00
wangliwen fd98a12cdc Merge branch 'dev' 2023-01-03 17:31:59 +08:00
wangliwen a9fd6f2455 ... 2023-01-03 17:31:52 +08:00
wangliwen 011753bb7d Merge branch 'dev' 2023-01-03 17:09:52 +08:00
wangliwen ad6deaf71f 调整 2023-01-03 17:09:44 +08:00
wangliwen 66d6281767 Merge branch 'dev' 2023-01-03 16:46:43 +08:00
wangliwen 1d87f545e6 周、月 度快照计划 2023-01-03 16:46:36 +08:00
wangliwen c53e1ca8ce Merge branch 'dev' 2023-01-03 15:34:51 +08:00
wangliwen 0400e52c1f 数据快照crud框架代码 2023-01-03 15:34:43 +08:00
wangliwen ccfeb75132 Merge branch 'dev' 2023-01-03 15:12:06 +08:00
wangliwen 8875a49486 创建数据快照数据表 2023-01-03 15:11:56 +08:00
wangliwen 4a6c279d57 Merge branch 'dev' 2023-01-03 10:20:28 +08:00
wangliwen 3d2656a2ca 全局格式化代码 2023-01-03 10:20:21 +08:00
wangliwen af93de247d Merge branch 'dev' 2022-12-29 09:28:01 +08:00
wangliwen a087eea1bf pageWithattr接口判断name参数长度、中文 来分别使用分词或like查询 2022-12-29 09:27:53 +08:00
wangliwen 9e7d473749 Merge branch 'dev' 2022-12-28 18:10:37 +08:00
dinggang 091186a0e8 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-28 18:09:49 +08:00
dinggang 18bb1799d9 1.西海岸个人申请过滤已到过期时间申请 2022-12-28 18:09:26 +08:00
wangliwen 2edb8ff079 Merge branch 'dev' 2022-12-28 14:51:49 +08:00
wangliwen 522f4066cf fix HIQDUCS-695 2022-12-28 14:51:42 +08:00
wangliwen 9adc3482f0 Merge branch 'dev' 2022-12-28 09:59:07 +08:00
wangliwen 3fc05f03bb Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-28 09:58:56 +08:00
wangliwen 037057b5af Merge branch 'dev' 2022-12-28 09:58:16 +08:00
wangliwen 6538b0fca5 2022-12-28 09:57:29 +08:00
dinggang be68353c77 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-28 09:55:11 +08:00
dinggang c767ee5846 浏览记录分页错误及按能力类型查询失效修复 2022-12-28 09:54:50 +08:00
wangliwen b4078b6537 Merge branch 'dev' 2022-12-28 09:46:38 +08:00
wangliwen 2e02838c73 配置文件assembly 赋权755 2022-12-28 09:46:29 +08:00
wangliwen 972c9f392a Merge branch 'dev' 2022-12-28 09:07:57 +08:00
wangliwen f9874ad45a 日志配置文件外置 2022-12-28 09:07:49 +08:00
wangliwen 7068578fe3 Merge branch 'dev' 2022-12-27 13:47:38 +08:00
wangliwen ffb0009a44 npe 2022-12-27 13:47:30 +08:00
wangliwen 5166ed440f Merge branch 'dev' 2022-12-27 11:11:36 +08:00
wangliwen 77a3bd0f58 判断逻辑。。 2022-12-27 11:11:27 +08:00
wangliwen 2a230b9c40 Merge branch 'dev' 2022-12-27 10:49:24 +08:00
wangliwen 898e499720 ... 2022-12-27 10:49:17 +08:00
wangliwen a04571795d 能力申请出浪潮云资源数据 2022-12-27 10:45:56 +08:00
wangliwen af256fad41 Merge branch 'dev' 2022-12-27 10:00:01 +08:00
wangliwen 96abf890b6 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-27 09:59:50 +08:00
wangliwen 4ac7e57d33 生产环境日志级别 2022-12-27 09:58:59 +08:00
dinggang 4f3b11f5f2 1.查询未配置审核人部门列表分页错误
2.我的已办,上架申请列表查询增加申请人筛选条件
3.资金大屏总节约资金统计逻辑修改
2022-12-27 09:55:52 +08:00
wangliwen b4c934e3c6 Merge branch 'dev' 2022-12-19 10:08:52 +08:00
wangliwen 9a5daeab88 云资源审核状态补全 2022-12-19 10:08:44 +08:00
wangliwen 1a7f647145 Merge branch 'dev' 2022-12-16 19:18:25 +08:00
wangliwen 71a3b827d1 ... 2022-12-16 19:18:19 +08:00
wangliwen 6f6c04c712 Merge branch 'dev' 2022-12-16 18:50:48 +08:00
wangliwen 498f86e5f7 ... 2022-12-16 18:50:41 +08:00
wangliwen 220c2a3fa3 Merge branch 'dev' 2022-12-16 18:38:46 +08:00
wangliwen 74e1420a36 ... 2022-12-16 18:33:46 +08:00
wangliwen f0d398b9a4 Merge branch 'dev' 2022-12-16 15:53:59 +08:00
wangliwen 8884612800 .... 2022-12-16 15:53:50 +08:00
wangliwen 95b17b089b Merge branch 'dev' 2022-12-16 15:09:33 +08:00
wangliwen 5db160ca18 ... 2022-12-16 15:09:26 +08:00
wangliwen 1a4505cefc Merge branch 'dev' 2022-12-16 15:07:49 +08:00
wangliwen 9769701093 ... 2022-12-16 15:07:42 +08:00
wangliwen 35aded9760 Merge branch 'dev' 2022-12-16 14:56:08 +08:00
wangliwen 2e5677486a ... 2022-12-16 14:56:00 +08:00
wangliwen 7795d59223 Merge branch 'dev' 2022-12-16 14:54:25 +08:00
wangliwen 9e37adfceb 过滤后端 HIQDUCS-666 2022-12-16 14:54:13 +08:00
wangliwen ea7027af3b Merge branch 'dev' 2022-12-16 11:46:38 +08:00
wangliwen 94260ff02d 2022-12-16 11:46:31 +08:00
wangliwen f9d893c8e7 ... 2022-12-16 11:45:59 +08:00
wangliwen da4c1b88ed Merge branch 'dev' 2022-12-16 10:49:33 +08:00
wangliwen 0f4d2c0bd0 /resource/page 接口支持传部门id过滤 2022-12-16 10:49:26 +08:00
wangliwen 3f5c12bc2c Merge branch 'dev' 2022-12-16 10:02:29 +08:00
wangliwen 0aede1e910 能力申请市局使用缓存线程池 2022-12-16 10:02:21 +08:00
wangliwen de0884b76f Merge branch 'dev' 2022-12-16 09:42:10 +08:00
wangliwen 859edc9864 ... 2022-12-16 09:41:55 +08:00
wangliwen 321bf20f4b Merge branch 'dev' 2022-12-15 17:03:44 +08:00
dinggang 81fe70aa42 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev 2022-12-15 16:45:47 +08:00
dinggang d403b27c5f .. 2022-12-15 16:43:19 +08:00
wangliwen 91651c7e1d Merge branch 'dev' 2022-12-15 14:45:03 +08:00
wangliwen 232c160abe npe 2022-12-15 14:44:55 +08:00
wangliwen a9e8c8319c Merge branch 'dev' 2022-12-15 14:27:40 +08:00
wangliwen db11899094 2022-12-15 14:27:33 +08:00
wangliwen c2596cf732 Merge branch 'dev' 2022-12-15 13:52:44 +08:00
wangliwen 274cbd9de8 ... 2022-12-15 13:52:34 +08:00
wangliwen 81847e3d6e Merge branch 'dev' 2022-12-15 12:33:36 +08:00
wangliwen 022b0d15e3 ... 2022-12-15 12:33:28 +08:00
wangliwen 6632b7fecb Merge branch 'dev' 2022-12-15 09:58:03 +08:00
wangliwen 889f59c7ae ... 2022-12-15 09:57:49 +08:00
wangliwen e10a025b48 Merge branch 'dev' 2022-12-14 16:11:02 +08:00
wangliwen 0b654e53f1 ... 2022-12-14 16:06:06 +08:00
wangliwen c5818df312 Merge branch 'dev' 2022-12-14 15:44:58 +08:00
wangliwen a495fff99d resourceSelectTotal 缓存失败的处理 2022-12-14 15:44:27 +08:00
wangliwen f7401dbaca Merge branch 'dev' 2022-12-14 15:26:17 +08:00
wangliwen 6fb4457625 ...屮 2022-12-14 15:26:07 +08:00
wangliwen b3af80bb0a Merge branch 'dev' 2022-12-14 15:17:14 +08:00