FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,946 Commits 1 Branch 0 Tags
95a80b832ce827fd5b898423123e973ac85cbd44
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 95a80b832c Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!407
 2022-02-24 13:54:37 +08:00
super_liu 86e74d5539 feat: There is no way the, 被代替标准自动生成 及 详情显示 2022-02-24 13:52:52 +08:00
super_liu 76a487e857 feat: There is no way the, 月末 (逻辑和 月初 一样 月末需跑一次下整月 防止特殊原因导致遗漏) 2022-02-24 10:46:56 +08:00
super_liu 287c909d25 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 企标复审计划月初逻辑 改为 下整月

See merge request LiuChao/foton-slrs-system-rest!406
 2022-02-23 09:08:39 +08:00
super_liu 85e90b378d feat: There is no way the, 企标复审计划月初逻辑 改为 下整月 2022-02-23 09:05:59 +08:00
super_liu fea30dc871 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, tree async

See merge request LiuChao/foton-slrs-system-rest!405
 2022-02-22 17:21:21 +08:00
super_liu 183ba86528 feat: There is no way the, tree async 2022-02-22 17:18:18 +08:00
super_liu 8fa99c5b30 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss tree auth

See merge request LiuChao/foton-slrs-system-rest!404
 2022-02-21 17:48:33 +08:00
super_liu 5352684945 feat: There is no way the, buss tree auth 2022-02-21 17:44:29 +08:00
super_liu 6ba63d508c Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!403
 2022-02-21 13:51:44 +08:00
super_liu e766dfdb53 feat: There is no way the, 注掉 国内 技术系列逻辑 2022-02-21 12:31:34 +08:00
super_liu 099df97db4 feat: There is no way the, tree 2022-02-21 12:26:24 +08:00
super_liu 341dcb9d5a Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 角色标准数据权限体系优化  国内标准左侧树 加入技术体系 待完成

See merge request LiuChao/foton-slrs-system-rest!402
 2022-02-18 17:52:13 +08:00
super_liu 020b1e6a3f feat: There is no way the, 角色标准数据权限体系优化 国内标准左侧树 加入技术体系 待完成 2022-02-18 17:49:04 +08:00
super_liu c6b36f72e1 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 新企标复审入库

See merge request LiuChao/foton-slrs-system-rest!401
 2022-02-17 17:27:45 +08:00
super_liu 8e7e210d35 feat: There is no way the, 新企标复审入库 2022-02-17 14:48:26 +08:00
super_liu f97f0d6e9c Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, 在线编辑 修改传参

See merge request LiuChao/foton-slrs-system-rest!400
 2022-02-16 08:56:14 +08:00
super_liu 95674848f2 feat: There is no way the, 在线编辑 修改传参 2022-02-15 16:27:19 +08:00
super_liu 658058a84f Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!399
 2022-02-11 17:16:20 +08:00
super_liu 012df3992a feat: There is no way the, 2022-02-10 20:40:41 +08:00
super_liu 6a56242ee4 feat: There is no way the, 2022-02-08 20:06:43 +08:00
super_liu 5e58d5212a Merge branch 'develop_master' into FOTON 2022-02-07 17:14:25 +08:00
super_liu 267554936f Merge branch 'develop_master' into FOTON 2022-01-28 21:47:51 +08:00
super_liu 6af05b4947 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!398
 2022-01-28 16:33:37 +08:00
super_liu 716c8c1ed6 feat: There is no way the, 2022-01-28 16:22:23 +08:00
super_liu 5b4f58d9db Merge branch 'develop_master' into FOTON 2022-01-27 22:44:41 +08:00
super_liu 34b0513275 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!396
 2022-01-27 22:40:46 +08:00
super_liu f6cbfdf178 feat: There is no way the, 2022-01-27 22:38:34 +08:00
super_liu 8d1594d6cb Merge branch 'develop_master' into FOTON 2022-01-27 08:32:18 +08:00
super_liu 7dc4c65fbd Merge branch 'develop_master' into FOTON 2022-01-25 20:15:57 +08:00
super_liu dc559482ac Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state scheduled

See merge request LiuChao/foton-slrs-system-rest!392
 2022-01-25 20:11:08 +08:00
super_liu ccaf7d5b86 feat: There is no way the, buss state scheduled 2022-01-25 18:42:46 +08:00
super_liu 986092d8ea Merge branch 'develop_master' into FOTON 2022-01-24 20:10:43 +08:00
super_liu b992c47c94 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss state

See merge request LiuChao/foton-slrs-system-rest!391
 2022-01-24 20:08:42 +08:00
super_liu 01a0a31d15 feat: There is no way the, buss state 2022-01-24 20:00:01 +08:00
super_liu 4bd68bb39d Merge branch 'develop_master' into FOTON 2022-01-22 08:26:29 +08:00
super_liu 1cab47439c Merge branch 'develop_master' into FOTON 2022-01-20 20:44:29 +08:00
super_liu 0c387355b4 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!381
 2022-01-20 20:43:52 +08:00
super_liu 4e61e5c077 Merge branch 'develop_master' into FOTON 2022-01-20 07:15:05 +08:00
super_liu cc001703f9 Merge branch 'develop_master' into FOTON 2022-01-19 17:44:37 +08:00
super_liu d5bf93da2b Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!379
 2022-01-19 17:23:55 +08:00
super_liu 3bd285aacd feat: There is no way the, 2022-01-19 17:17:24 +08:00
super_liu 3a2ef34b80 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, plan lxd

See merge request LiuChao/foton-slrs-system-rest!374
 2022-01-18 16:31:53 +08:00
super_liu 2f18292492 feat: There is no way the, plan lxd 2022-01-18 16:28:20 +08:00
super_liu fe9d3c6ec6 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!373
 2022-01-18 03:42:27 +08:00
super_liu 4e362e485b Merge branch 'develop_3' into 'develop_master' 
企标查询 忽略空格

See merge request LiuChao/foton-slrs-system-rest!371
 2022-01-14 06:38:06 +08:00
super_liu 3aa9aba85c Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!369
 2022-01-13 06:18:49 +08:00
super_liu 2659f0a783 feat: There is no way the, 2022-01-12 23:58:15 +08:00
super_liu e2bbc146ae Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!368
 2022-01-11 22:55:54 +08:00
super_liu 67395f75c7 Merge branch 'develop_master' into FOTON 2022-01-10 23:31:57 +08:00
super_liu 1a520f0d76 Merge branch 'develop_master' into FOTON 2022-01-08 17:34:18 +08:00
super_liu 12373a02eb Merge branch 'develop_master' into FOTON 2022-01-06 20:34:05 +08:00
super_liu 8b7ea559f8 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!358
 2022-01-06 18:03:26 +08:00
super_liu fe2949edd5 feat: There is no way the, 2022-01-06 18:02:47 +08:00
super_liu b9410fbd69 Merge branch 'develop_master' into FOTON 2022-01-05 21:39:20 +08:00
super_liu 2faa8a452e Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!352
 2022-01-05 21:37:30 +08:00
super_liu 5fdb04f96f feat: There is no way the, 2022-01-05 21:21:48 +08:00
super_liu 496499c08f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!351
 2022-01-05 17:55:18 +08:00
super_liu a956ea2526 feat: There is no way the, 2022-01-05 17:53:15 +08:00
super_liu 20874906e7 Merge branch 'develop_master' into FOTON 2021-12-31 03:54:31 +08:00
super_liu bbb53f2e24 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, xxx

See merge request LiuChao/foton-slrs-system-rest!345
 2021-12-31 03:50:17 +08:00
super_liu 1a3d317c05 feat: There is no way the, xxx 2021-12-31 03:49:23 +08:00
super_liu d3792ff7c4 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!341
 2021-12-30 14:28:31 +08:00
super_liu e74e5ded22 feat: There is no way the, 2021-12-30 14:27:25 +08:00
super_liu 602c3e9772 Merge branch 'develop_master' into FOTON 2021-12-29 22:02:22 +08:00
super_liu a4b9f80e9f Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss plan planStatusList

See merge request LiuChao/foton-slrs-system-rest!337
 2021-12-29 17:54:50 +08:00
super_liu 5311451b1c feat: There is no way the, buss plan planStatusList 2021-12-29 17:54:07 +08:00
super_liu 3595251fde Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss plan add bussSort

See merge request LiuChao/foton-slrs-system-rest!333
 2021-12-29 10:32:01 +08:00
super_liu b63d82a43e feat: There is no way the, buss plan add bussSort 2021-12-29 10:30:45 +08:00
super_liu 5af18044be Merge branch 'develop_master' into FOTON 2021-12-28 16:58:23 +08:00
super_liu f4677d123e Merge branch 'develop_master' into FOTON 2021-12-28 03:39:57 +08:00
super_liu 94d5d2e128 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the, buss2 process

See merge request LiuChao/foton-slrs-system-rest!329
 2021-12-27 17:47:33 +08:00
super_liu 7e4fbe6ea1 feat: There is no way the, buss2 process 2021-12-27 17:45:51 +08:00
super_liu 49e0469818 Merge branch 'develop_master' into FOTON 2021-12-23 22:04:22 +08:00
super_liu 60c4957bcb Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!319
 2021-12-23 22:03:17 +08:00
super_liu 223008e42b Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!310
 2021-12-21 17:21:08 +08:00
super_liu 8b225fbb14 feat: There is no way the, 2021-12-21 17:01:48 +08:00
super_liu 8ef5e27843 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!308
 2021-12-21 14:41:06 +08:00
super_liu 382f42b8e5 feat: There is no way the, 2021-12-21 14:39:06 +08:00
super_liu 56212b7beb Merge branch 'develop_master' into FOTON 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2021-12-18 13:59:23 +08:00
super_liu 545e5bba72 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!298
 2021-12-18 13:56:14 +08:00
super_liu 57b19f5c79 feat: There is no way the, iphone 2021-12-18 13:55:17 +08:00
super_liu e114b10ac5 feat: There is no way the, del only callback code 2021-12-17 16:46:07 +08:00
super_liu 9c6df264d6 Merge branch 'develop_master' into FOTON 2021-12-16 20:17:58 +08:00
super_liu ddbedc1b28 Merge branch 'develop_migration' into 'develop_master' 
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!293
 2021-12-16 18:18:40 +08:00
super_liu 90d6c0d4cf feat: There is no way the, 2021-12-16 18:13:17 +08:00
super_liu aec8010403 Merge remote-tracking branch 'origin/FOTON' into FOTON 2021-12-15 21:18:35 +08:00
super_liu f8309fdce0 feat: There is no way the 2021-12-15 21:17:53 +08:00
Superman_Main 9dc572e3d9 feat: There is no way the 2021-12-15 21:17:52 +08:00
Superman_Main 0877fb2df8 feat: There is no way the 2021-12-15 21:17:20 +08:00
Superman_Main 5ef31f9837 feat: There is no way the 2021-12-15 21:16:25 +08:00
super_liu f5b4ccc073 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!287
 2021-12-15 21:14:25 +08:00
super_liu bfc305b1bf Merge branch 'develop_master' into FOTON 2021-12-15 21:13:34 +08:00
super_liu 79e7719be4 feat: There is no way the 2021-12-15 14:26:03 +08:00
super_liu 1062cd6c36 Merge branch 'develop_migration' into 'develop_master' 
Develop migration

See merge request LiuChao/foton-slrs-system-rest!281
 2021-12-15 09:10:07 +08:00
super_liu e814c496d5 feat: There is no way the, 2021-12-15 09:09:22 +08:00
super_liu 121dc4b965 feat: There is no way the, 2021-12-15 09:08:41 +08:00
super_liu 417df71582 Merge branch 'develop_master' into FOTON 2021-12-14 21:56:59 +08:00
super_liu 1e83fad8bd feat: There is no way the 2021-12-14 21:56:42 +08:00
super_liu 3162479ce1 Merge branch 'develop_master' into FOTON 2021-12-14 21:48:43 +08:00