Commit Graph
100 Commits
Author SHA1 Message Date
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 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 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 cc6b7da794 feat: There is no way the,buss 2021-12-18 22:52:57 +08:00
super_liu 84e9d46d9e feat: There is no way the,buss 2021-12-18 22:28:08 +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 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 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
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
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 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
Superman_Main afa39bc706 feat: There is no way the 2021-12-03 14:27:12 +08:00
Superman_Main bd22414d5c Merge remote-tracking branch 'origin/develop' into develop 2021-12-03 14:15:59 +08:00
Superman_Main c1a816c148 feat: There is no way the 2021-12-03 14:15:36 +08:00
Superman_Main bdf3d0b97f Merge remote-tracking branch 'origin/develop' into develop 2021-11-30 11:07:40 +08:00
Superman_Main 9ef1d01339 feat: There is no way the 2021-11-30 11:05:55 +08:00
Superman_Main 00e8f08a00 feat: There is no way the 2021-11-21 10:18:28 +08:00
Superman_Main 7894ac6ad0 Merge remote-tracking branch 'origin/develop' into develop 2021-11-20 21:45:04 +08:00
Superman_Main a5d9ce0a34 feat: There is no way the 2021-11-20 21:44:40 +08:00
Superman_Main a5dfdcede5 Merge remote-tracking branch 'origin/develop' into develop 2021-11-18 16:01:25 +08:00
Superman_Main 6c55bea46d feat: There is no way the,Buss Library 2021-11-18 16:00:15 +08:00
super_liu 7d46ad2480 Merge remote-tracking branch 'origin/develop' into develop 2021-11-08 10:15:54 +08:00
super_liu 0d726dd430 feat: There is no way the,Laws 2021-11-03 15:46:57 +08:00
super_liu 4cbb52d32a Merge remote-tracking branch 'origin/develop' into develop 2021-11-02 18:00:18 +08:00
super_liu 2a2088fa87 feat: There is no way the,Laws 2021-11-02 17:59:26 +08:00
super_liu 7ec7c38399 feat: There is no way the,LAWS 2021-10-31 18:20:40 +08:00
super_liu 6ffffcb80b feat: There is no way the 2021-10-18 16:41:11 +08:00
super_liu fc2ab72dc8 Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:47:38 +08:00
super_liu 2246c07b3f Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 14:44:23 +08:00
super_liu b3311d58fe feat: There is no way the 2021-10-14 14:44:10 +08:00
super_liu fa11b4a019 Merge remote-tracking branch 'origin/develop' into develop 2021-10-14 13:52:22 +08:00
super_liu 75f0a6156e feat: There is no way the 2021-10-13 17:56:39 +08:00
super_liu dce69e75c5 Merge remote-tracking branch 'origin/develop' into develop 2021-10-13 17:56:04 +08:00
super_liu 180cecae8f feat: There is no way the oa add endTime 2021-10-13 17:55:34 +08:00
super_liu ddc50fbe1f feat: There is no way the 2021-10-12 14:42:31 +08:00
super_liu 0e258bc365 Merge remote-tracking branch 'origin/develop' into develop 2021-10-12 14:40:54 +08:00
super_liu a616db878d feat: There is no way the 2021-10-12 14:40:39 +08:00
super_liu fdcc307886 feat: There is no way the 2021-10-12 13:35:15 +08:00
super_liu a016139168 feat: There is no way the 2021-10-12 11:11:53 +08:00
super_liu 92698afcb0 Merge branch 'develop_oa' into 'develop'
feat: There is no way the Feign add token

See merge request foton-wkflow-group/foton-wkflow-rest!64
2021-10-11 18:11:13 +08:00
super_liu a279ac2ab7 feat: There is no way the Feign add token 2021-10-11 18:08:31 +08:00
super_liu ed34f22042 Merge branch 'develop_oa' into 'develop'
feat: There is no way the schedule

See merge request foton-wkflow-group/foton-wkflow-rest!63
2021-09-30 17:59:23 +08:00
super_liu 48e816e006 feat: There is no way the schedule 2021-09-30 17:58:45 +08:00
super_liu c9d783c3a6 Merge branch 'develop_oa' into 'develop'
Develop oa

See merge request foton-wkflow-group/foton-wkflow-rest!62
2021-09-30 15:29:13 +08:00
super_liu 9ed1637677 feat: There is no way the schedule 2021-09-30 15:25:44 +08:00
super_liu f96f8f4faa feat: There is no way the oa conf 2021-09-29 18:02:27 +08:00
super_liu e79d6b735e feat: There is no way the task exec 2021-09-29 18:00:54 +08:00
super_liu f583e7983b feat: There is no way the 2021-09-27 15:39:08 +08:00
super_liu 5080f65dfc feat: There is no way the 2021-09-27 12:25:11 +08:00
super_liu 66b5b35ab3 feat: There is no way the All process before add oa 2021-09-26 17:08:02 +08:00
super_liu 5bbe5f42c0 feat: There is no way the task exec 2021-09-25 11:43:43 +08:00
super_liu 86397d169d feat: There is no way the 2021-09-23 17:59:52 +08:00
super_liu 8651c6ee36 Merge branch 'develop' into develop_oa 2021-09-23 16:20:10 +08:00
super_liu d2d509c7c8 feat: There is no way the MQ conf 2021-09-23 16:19:19 +08:00
super_liu 965f518666 feat: There is no way the MQ conf 2021-09-19 17:37:39 +08:00
super_liu 96d9b84018 feat: There is no way the MQ conf 2021-09-19 15:58:26 +08:00
super_liu 7fcda70b9b feat: There is no way the 2021-09-18 17:58:40 +08:00
super_liu 897cb7f885 feat: There is no way the 2021-09-17 18:02:00 +08:00
super_liu d15b0f8ac8 Merge branch 'develop' into develop_oa 2021-09-16 15:06:15 +08:00
super_liu 83812a2668 feat: There is no way the 2021-09-16 15:05:06 +08:00
super_liu 22812a7f6e feat: There is no way the 2021-09-15 17:07:08 +08:00
super_liu ca6bdcbee8 feat: There is no way the 2021-09-15 16:50:35 +08:00
super_liu 3566ae5a18 feat: There is no way the 2021-09-12 19:10:10 +08:00
super_liu 9e8e9eea6b feat: There is no way the 2021-09-10 14:43:45 +08:00
super_liu c94e198e51 Merge remote-tracking branch 'origin/develop' into develop 2021-09-02 15:21:09 +08:00
super_liu 9366853f0c feat: There is no way the Transfer and withdrawal 2021-09-02 15:20:57 +08:00
super_liu 963556d9bb Merge remote-tracking branch 'origin/develop' into develop 2021-07-29 22:42:19 +08:00
super_liu cce61e367c feat:1111 2021-07-29 22:42:06 +08:00
super_liu c3b0a14a4a Merge remote-tracking branch 'origin/develop' into develop 2021-07-28 14:49:03 +08:00
super_liu f64f3d6997 标准入库 流程名称回显修改 2021-07-28 14:48:43 +08:00
super_liu 3ce59561f9 fix: bug 修改自定义流程名称 2021-07-27 11:10:40 +08:00
super_liu 261cc9448a feat: 标准入库流程提交 2021-06-23 16:45:19 +08:00
super_liu b8ec9d4082 feat: 标准入库流程提交 2021-06-22 18:08:36 +08:00
super_liu bb1504db56 feat: 标准入库流程提交 2021-06-22 11:41:02 +08:00
super_liu 994d7091f0 feat: 标准入库流程提交 2021-06-21 18:37:17 +08:00
super_liu 30716da96c feat: 标准入库流程提交 2021-06-21 14:10:35 +08:00