FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,362 Commits 1 Branch 0 Tags
e7302f306d0f693e97ffa839f778b42eb20c351b
Commit Graph
1362 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王夏晖 e7302f306d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!263
 2021-12-01 20:54:21 +08:00
zhaokaiyao@91isoft.com fbca49f8e9 预警 标准名称查询 2021-12-01 20:11:23 +08:00
zhaokaiyao@91isoft.com 852bdf5f77 预警 查询 2021-12-01 19:47:05 +08:00
zhaokaiyao@91isoft.com db899732c3 预警 定时任务 2021-12-01 19:11:11 +08:00
zhaokaiyao@91isoft.com 3e48e5f4f5 预警 定时任务 2021-12-01 19:11:01 +08:00
zhaokaiyao@91isoft.com 960ea90b4a 预警 定时任务 2021-12-01 19:08:59 +08:00
zhaokaiyao@91isoft.com 90d84a7443 模块结构单元 2021-12-01 19:00:55 +08:00
yuezhihang 895289a1a0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-01 17:59:23 +08:00
yuezhihang 455fc2ba0e 12.1bug修复 2021-12-01 17:59:17 +08:00
zhaokaiyao@91isoft.com f76e0aabe5 取消事务 2021-12-01 16:49:45 +08:00
super_liu 535a4c392d Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss sort

See merge request LiuChao/foton-slrs-system-rest!261
 2021-12-01 15:42:25 +08:00
Superman_Main c27beedaa2 feat: There is no way the, buss sort 2021-12-01 15:41:11 +08:00
zhaokaiyao@91isoft.com 234e4aa036 预警定时任务 2021-12-01 15:31:50 +08:00
super_liu 04c35a2751 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!260
 2021-12-01 14:22:48 +08:00
Superman_Main 7078179608 feat: There is no way the, 2021-12-01 13:42:39 +08:00
zhaokaiyao@91isoft.com e89725a2f7 预警区间 2021-12-01 11:28:23 +08:00
zhaokaiyao@91isoft.com 03b8e3ee67 预警区间 2021-12-01 11:27:34 +08:00
zhaokaiyao@91isoft.com 1973529a69 取消预警 2021-12-01 11:27:07 +08:00
zhaokaiyao@91isoft.com d977214a56 预警查询 2021-12-01 11:25:56 +08:00
王夏晖 bc4529bf03 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!258
 2021-11-30 22:49:46 +08:00
zhaokaiyao@91isoft.com cd86b4a30c vpps查询第一层目录 2021-11-30 21:08:21 +08:00
zhaokaiyao@91isoft.com b43cc664e2 //todo 2021-11-30 20:47:46 +08:00
zhaokaiyao@91isoft.com 25d8f1bdf7 重点问题跟踪新增判断是否重复 2021-11-30 20:47:46 +08:00
王夏晖 878bc07e61 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!256
 2021-11-30 19:09:28 +08:00
zhaokaiyao@91isoft.com da97a60716 国家地区清单查询 2021-11-30 17:40:28 +08:00
zhaokaiyao@91isoft.com 519ac979ad Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-29 22:47:10 +08:00
zhaokaiyao@91isoft.com 56c94ac3d6 ssrq为空时显示空 2021-11-29 22:46:51 +08:00
super_liu 7371b18a52 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!255
 2021-11-29 16:15:20 +08:00
Superman_Main 0d43dde5f6 feat: There is no way the, 2021-11-29 16:14:38 +08:00
zhaokaiyao@91isoft.com 3117af535b 定时标准预警(不推送) 2021-11-29 14:15:44 +08:00
zhaokaiyao@91isoft.com 8753b1ab66 @TableField("del_flag") 2021-11-29 14:15:01 +08:00
super_liu 78da27b088 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, contrast

See merge request LiuChao/foton-slrs-system-rest!254
 2021-11-28 16:56:37 +08:00
Superman_Main 1bc8b4dd4d feat: There is no way the, contrast 2021-11-28 16:54:36 +08:00
zhaokaiyao@91isoft.com 6a44415e85 标准日期多选 2021-11-28 12:22:43 +08:00
super_liu 7414e25be7 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!253
 2021-11-27 19:52:36 +08:00
Superman_Main 0b69fc9e65 Merge branch 'develop_master' into develop_migration 2021-11-27 19:51:44 +08:00
Superman_Main 5c4f8108d7 feat: There is no way the, 2021-11-27 19:50:56 +08:00
zhaokaiyao@91isoft.com eeaf62845d Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-27 14:14:40 +08:00
zhaokaiyao@91isoft.com 419f519430 关联模块 2021-11-27 14:14:18 +08:00
super_liu c8fe351362 Merge branch 'develop_3' into 'develop_master' 
vpps数据显示

See merge request LiuChao/foton-slrs-system-rest!252
 2021-11-26 21:24:46 +08:00
zhaokaiyao@91isoft.com c209bb485c 关联模块 2021-11-26 20:29:21 +08:00
yuezhihang 4c31f54a5e 11.26 项目维度 查询标准数据接口修改1 2021-11-26 16:41:50 +08:00
zhaokaiyao@91isoft.com 9000a6e3fe vpps数据显示 2021-11-26 10:57:58 +08:00
super_liu 93a6c6034d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!251
 2021-11-26 08:58:00 +08:00
zhaokaiyao@91isoft.com 9818f55eca vpps懒加载查询 2021-11-25 18:06:42 +08:00
yuezhihang 08853080db 未符合项整改 -新增和修改 2021-11-25 17:24:45 +08:00
zhaokaiyao@91isoft.com d220eb2f07 解决了完全体的小bug 2021-11-24 17:44:42 +08:00
zhaokaiyao@91isoft.com 30447c09e2 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-11-24 17:09:37 +08:00
zhaokaiyao@91isoft.com 496ab17d73 标准预警查询完全体 2021-11-24 17:09:10 +08:00
zhaokaiyao@91isoft.com 81f4444164 标准预警查询完全体 2021-11-24 17:08:25 +08:00