FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
583 Commits 2 Branches 0 Tags
c073b2467f6045470bba41d876454ab9300b24bc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu b3887e9a63 Merge remote-tracking branch 'origin/develop' into develop 2022-03-07 11:22:58 +08:00
super_liu 8c262a9f65 feat: prc 24 , 企标废止 流程名称 统一修改 2022-03-07 11:22:36 +08:00
super_liu 6889bce921 Merge remote-tracking branch 'origin/develop' into develop 2022-03-02 11:05:52 +08:00
super_liu 8a8f550b3b feat: 改流程名称 2022-03-02 11:05:30 +08:00
super_liu 00f81edd3e feat: buss3 2022-02-18 11:28:31 +08:00
super_liu 1d1a4d4ffd feat: buss3 变更流程名称 2022-02-18 09:40:36 +08:00
super_liu a075b6e987 feat: buss3 流程名称 前缀+企标名称 2022-02-18 09:14:09 +08:00
super_liu e57f0a8358 feat: buss3 2022-02-17 16:53:42 +08:00
super_liu a42365b18d feat: buss3 新复审流程 2022-02-17 14:56:38 +08:00
super_liu 8386384782 Merge remote-tracking branch 'origin/develop' into develop 2022-02-16 18:01:19 +08:00
super_liu 15ab163b6e feat: buss3 2022-02-16 18:00:56 +08:00
super_liu 8957b37bc7 Merge remote-tracking branch 'origin/develop' into develop 2022-02-15 16:26:15 +08:00
super_liu 1da1896757 feat: model online 2022-02-15 16:25:54 +08:00
super_liu 9ea941acbc Merge remote-tracking branch 'origin/develop' into develop 2022-02-07 15:34:19 +08:00
super_liu fc5ef06787 feat: buss3 2022-02-07 15:33:58 +08:00
super_liu f95be065de Merge remote-tracking branch 'origin/develop' into develop 2022-01-27 22:37:15 +08:00
super_liu 53566a3b73 feat: There is no way the, 2022-01-27 22:37:03 +08:00
super_liu 20d4e72512 Merge remote-tracking branch 'origin/develop' into develop 2022-01-22 16:05:30 +08:00
super_liu f379654096 feat: There is no way the, 2022-01-22 16:05:08 +08:00
super_liu eef6df51fc feat: There is no way the, 2022-01-20 17:43:21 +08:00
super_liu 2876861262 feat: There is no way the, 2022-01-19 17:35:50 +08:00
super_liu 0d8bbf2c3a Merge remote-tracking branch 'origin/develop' into develop 2022-01-18 16:24:08 +08:00
super_liu d7faeff45f feat: There is no way the,plan lxd 2022-01-18 16:23:47 +08:00
super_liu 34e25b84dc feat: There is no way the 2022-01-16 20:38:16 +08:00
Superman_Main 9031326540 feat: There is no way the 2022-01-14 15:28:25 +08:00
Superman_Main 4b1fc38969 feat: There is no way the 2022-01-14 15:28:25 +08:00
super_liu 6c050ba6cf Merge branch 'develop' into FOTON 2022-01-14 14:22:44 +08:00
super_liu fbb82976ad feat: There is no way the, 2022-01-14 14:21:40 +08:00
super_liu 612bedc6b3 Merge branch 'develop' into FOTON 2022-01-11 22:59:07 +08:00
super_liu 9cef46040b Merge remote-tracking branch 'origin/develop' into develop 2022-01-11 22:56:11 +08:00
super_liu 4fd2c5fdb8 feat: There is no way the, buss2 2022-01-11 22:55:26 +08:00
super_liu b4b1e02c58 Merge branch 'develop' into FOTON 2022-01-10 23:25:27 +08:00
super_liu d9e95721df Merge remote-tracking branch 'origin/develop' into develop 2022-01-10 23:24:26 +08:00
super_liu 9cecf33eb2 feat: There is no way the, 2022-01-10 23:24:11 +08:00
super_liu 19ba1578c2 Merge remote-tracking branch 'origin/develop' into develop 2022-01-07 15:41:36 +08:00
super_liu 983f896b30 feat: There is no way the, 2022-01-07 15:41:15 +08:00
super_liu 6990726953 Merge branch 'develop' into FOTON 2022-01-06 20:26:41 +08:00
super_liu b4667922fc Merge remote-tracking branch 'origin/develop' into develop 2022-01-06 17:57:46 +08:00
super_liu f4bf45b24d feat: There is no way the, 2022-01-06 17:57:27 +08:00
super_liu 203e45e3b4 Merge branch 'develop' into FOTON 2022-01-06 17:21:45 +08:00
super_liu fe10071aaa feat: There is no way the 2022-01-06 17:21:22 +08:00
super_liu 67d61aff44 Merge branch 'develop' into FOTON 2022-01-06 17:20:00 +08:00
super_liu 373d80f126 Merge remote-tracking branch 'origin/FOTON' into FOTON 2022-01-06 17:19:27 +08:00
super_liu 14141938a5 feat: There is no way the, 2022-01-06 17:18:12 +08:00
super_liu 3251abd371 Merge remote-tracking branch 'origin/develop' into develop 2022-01-06 13:48:35 +08:00
super_liu a42587384c feat: There is no way the, 2022-01-06 13:48:22 +08:00
super_liu b25ed9f6fc Merge branch 'develop' into FOTON 2022-01-05 21:29:13 +08:00
super_liu 9d22f721f7 feat: There is no way the, 2022-01-04 16:21:01 +08:00
super_liu 6a489613c2 Merge remote-tracking branch 'origin/develop' into develop 2022-01-04 15:42:31 +08:00
super_liu ed7eb3e0a1 feat: There is no way the, 2022-01-04 15:42:13 +08:00
super_liu 8a718ff5b5 Merge remote-tracking branch 'origin/develop' into develop 2021-12-30 14:01:48 +08:00
super_liu 9af93b357e feat: There is no way the,buss node 7 reject and prcName update 2021-12-30 13:58:06 +08:00
super_liu 13fe5ff97b Merge branch 'develop' into FOTON 2021-12-29 21:52:05 +08:00
super_liu 00c89052f5 Merge branch 'develop' into FOTON 2021-12-29 05:09:56 +08:00
super_liu 4029f2c243 Merge remote-tracking branch 'origin/develop' into develop 2021-12-28 15:39:17 +08:00
super_liu 60790f8c1d feat: There is no way the,buss product 2021-12-28 15:38:26 +08:00
super_liu 9823805404 Merge branch 'develop' into FOTON 2021-12-28 03:35:14 +08:00
super_liu 5a48edc6d8 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 21:13:55 +08:00
super_liu bade21c7b9 feat: There is no way the,buss2 2021-12-27 21:13:36 +08:00
super_liu 8b8a515f52 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 17:44:56 +08:00
super_liu 8d430df609 feat: There is no way the,buss 2021-12-27 17:44:37 +08:00
super_liu 819eea2282 Merge remote-tracking branch 'origin/develop' into develop 2021-12-27 15:11:32 +08:00
super_liu 9ee81e8b7e feat: There is no way the,buss 2021-12-27 15:11:10 +08:00
super_liu 0c59759427 Merge remote-tracking branch 'origin/develop' into develop 2021-12-26 18:11:37 +08:00
super_liu a02539dd25 feat: There is no way the,buss 2021-12-26 18:08:28 +08:00
super_liu 4bd9b583ef Merge remote-tracking branch 'origin/develop' into develop 2021-12-24 17:46:04 +08:00
super_liu 8e4ba992c0 feat: There is no way the,buss 2021-12-24 17:45:36 +08:00
super_liu 20d01898b8 Merge branch 'develop' into FOTON 2021-12-23 21:58:52 +08:00
super_liu 7d6111db6b Merge branch 'develop' into FOTON 2021-12-18 22:53:34 +08:00
super_liu cc6b7da794 feat: There is no way the,buss 2021-12-18 22:52:57 +08:00
super_liu 02dd8d7530 Merge branch 'develop' into FOTON 2021-12-18 22:29:29 +08:00
super_liu 84e9d46d9e feat: There is no way the,buss 2021-12-18 22:28:08 +08:00
super_liu 899550f5a1 Merge branch 'develop' into FOTON 2021-12-17 17:14:58 +08:00
super_liu deebed8890 feat: There is no way the,buss 2021-12-17 16:53:57 +08:00
super_liu e118843481 Merge remote-tracking branch 'origin/develop' into develop 2021-12-17 16:43:00 +08:00
super_liu 3847a33631 feat: There is no way the,buss add onlyOffice callback 2021-12-17 16:42:43 +08:00
super_liu 002c8bb88f Merge remote-tracking branch 'origin/develop' into develop 2021-12-17 13:52:01 +08:00
super_liu 2720b4a534 feat: There is no way the,OA 2021-12-17 13:51:39 +08:00
super_liu 8bcb65318b Merge branch 'develop' into FOTON 2021-12-16 20:15:44 +08:00
super_liu 35296d7f5e Merge remote-tracking branch 'origin/develop' into develop 2021-12-16 18:13:14 +08:00
super_liu e35878cbca feat: There is no way the,buss 2021-12-16 18:12:11 +08:00
super_liu b6217fb721 Merge remote-tracking branch 'origin/develop' into develop 2021-12-15 21:44:49 +08:00
super_liu 11b7631d87 feat: There is no way the,buss 2021-12-15 21:44:39 +08:00
super_liu efab4f35b0 Merge branch 'develop' into FOTON 2021-12-15 21:10:40 +08:00
super_liu 6fa6ca1a75 Merge branch 'develop' into FOTON 2021-12-15 11:36:54 +08:00
super_liu 70878668c8 feat: There is no way the 2021-12-14 21:46:24 +08:00
super_liu b26947e8a3 Merge branch 'develop' into FOTON 
# Conflicts:
#	src/main/resources/application.yml
 2021-12-14 21:45:45 +08:00
super_liu 002630a5d2 Merge remote-tracking branch 'origin/develop' into develop 2021-12-14 21:21:17 +08:00
super_liu 4a28ed8d04 feat: There is no way the,buss 2021-12-14 21:21:05 +08:00
super_liu 5bf33d5374 Merge branch 'develop' into FOTON 2021-12-14 15:20:20 +08:00
Superman_Main d50c43c8fa Merge remote-tracking branch 'origin/develop' into develop 2021-12-10 10:45:33 +08:00
Superman_Main 85bd4ea485 feat: There is no way the,buss eval 2021-12-10 10:45:16 +08:00
Superman_Main b8c5d84cfa Merge branch 'develop' into FOTON 2021-12-08 21:23:18 +08:00
super_liu d6c38bc0ff Merge branch 'Three' into 'develop' 
Three

See merge request foton-wkflow-group/foton-wkflow-rest!65
 2021-12-08 15:41:46 +08:00
Superman_Main 04ed85b528 Merge branch 'develop' into Three 
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
 2021-12-08 15:08:55 +08:00
Superman_Main 5b9cf2aca8 Merge remote-tracking branch 'origin/Three' into Three 2021-12-08 15:06:46 +08:00
Superman_Main 37031fb9c4 feat: There is no way the 2021-12-08 15:06:02 +08:00
Superman_Main 1d5a23aace Merge branch 'develop' into FOTON 2021-12-08 09:03:40 +08:00
Superman_Main d579a5e20e Merge remote-tracking branch 'origin/develop' into develop 2021-12-08 09:02:05 +08:00
Superman_Main 13a825ab5f feat: There is no way the,buss 2021-12-08 09:01:32 +08:00