Commit Graph

289 Commits

Author SHA1 Message Date
huaxia2002 2c5edea8df 新增lockedAuditList去除了sub_round的筛选条件 2023-08-02 11:06:31 +08:00
lingfeng dd85739106 Merge commit 'c757a477c6c40aecf4480d14556d11e69dfeef2a' into dev_glcc 2023-06-30 10:39:08 +08:00
lingfeng a87987fb0a 0元项目 2023-06-30 10:04:01 +08:00
lingfeng 3f8284d060 Merge commit '2124b3040c9bff27c0836f428180f5155f7926ff' into dev_glcc 2023-06-29 16:34:23 +08:00
lingfeng 88c4e964d8 Merge remote-tracking branch 'origin/dev_glcc' into dev_glcc 2023-06-29 16:33:49 +08:00
lingfeng 4a249934ac 0元项目接口 2023-06-29 16:33:30 +08:00
xxq250 c076053df3 sql日志到文件 2023-06-29 15:06:44 +08:00
lingfeng 6de6411601 0元项目接口 2023-06-29 14:37:40 +08:00
lingfeng eed1a7b1f4 /taskList add locked field 2023-06-29 13:57:33 +08:00
lingfeng 20f3be2dd8 authMatch 2023-06-28 11:01:35 +08:00
lingfeng c3293dc985 Merge remote-tracking branch 'origin/dev_glcc' into dev_glcc 2023-06-28 10:46:19 +08:00
lingfeng 6b6e1e4895 authMatch 2023-06-28 10:46:11 +08:00
wanjia 8be9098282 Merge static resources into dev_glcc 2023-06-27 14:54:05 +08:00
lingfeng 1dbdca56de fix 2023-06-27 11:54:53 +08:00
lingfeng 231c671aa4 Merge commit '2a1756ec754474ffd0e8580b2fe1403f0b64f2f3' into dev_glcc 2023-06-27 11:36:30 +08:00
lingfeng 62bff0df6c Merge commit 'd82ec7904c8669dd521fff6789aef1ebea127de6' into dev_glcc 2023-06-27 10:45:11 +08:00
lingfeng 778573b7c1 注释 2023-06-27 10:35:50 +08:00
lingfeng b901c23157 Merge commit 'd5597bf0eb81364a0e8960199ea5f57b77bbf25e' into dev_glcc 2023-06-27 09:35:22 +08:00
lingfeng fa7ce53241 sub_round 2023-06-27 09:34:55 +08:00
lingfeng fc26503199 sub_round 2023-06-26 17:17:02 +08:00
lingfeng 6ddd291bd0 currentTime 2023-06-26 09:42:51 +08:00
lingfeng ff5c775964 当contact_mail= tutor_mail, 仅需要发送一封站内信和邮件。 2023-06-20 16:34:14 +08:00
lingfeng e2bcae1a71 @ExcelProperty(value = "审核状态") 2023-06-15 14:58:49 +08:00
lingfeng 1c04c04801 Merge commit 'd7c43bf888f01ab0ca39011e3578b9d98fa6ae62' into dev_glcc 2023-06-14 10:32:38 +08:00
lingfeng f0c8bba090 exportTask 2023-06-13 17:09:17 +08:00
lingfeng 678cce13c3 exportTask 2023-06-13 17:06:32 +08:00
lingfeng e27fbc9105 Merge remote-tracking branch 'origin/dev_glcc' into dev_glcc 2023-06-13 13:51:19 +08:00
lingfeng 315741857b getUserInfo test 2023-06-13 13:51:11 +08:00
wanjia 208031ee71 Merge frontend resource into dev_glcc 2023-06-13 10:12:35 +08:00
wanjia eca0ee7926 Merge frontend resource into dev_glcc 2023-06-12 17:38:47 +08:00
lingfeng c5313f7d58 Merge commit 'db461b196d9de1e464cb970766bf475db44298f6' into dev_glcc 2023-06-12 17:10:21 +08:00
lingfeng b5164ef511 /api 2023-06-12 16:45:26 +08:00
lingfeng 4d115a757b Merge commit '7601817f8db9ef184cc349da93b196849ba7abc2' into dev_glcc
:wq
2023-06-12 15:53:17 +08:00
lingfeng 39f8c025e5 Merge commit 'd6b26861fae5aa049a6fc86ddb026608e4e84b64' into dev_glcc 2023-06-12 14:57:29 +08:00
lingfeng 0264d2f7f4 Merge commit '5fe35a6eb828dc096ef33f1c5f5ce10cfe045bff' into dev_glcc 2023-06-12 11:26:00 +08:00
lingfeng 51aa040462 Merge commit 'ad8a525d2c7cacb4d1fc7b1263dfd3089c2c6a87' into dev_glcc 2023-06-07 10:07:48 +08:00
lingfeng 618bdd630e Merge commit 'ec22ac65778afd2164d9f3803cd1baefbf2722cc' into dev_glcc 2023-06-06 14:46:34 +08:00
lingfeng 903ae3cd71 feat:add findStuByTaskId 2023-06-06 14:13:45 +08:00
lingfeng 10511839e3 feat:add findStuByTaskId 2023-06-06 14:07:24 +08:00
lingfeng 82460bc234 Merge commit 'e6565272d57a1132d7004a21c5a4d0f18b4296dd' into dev_glcc 2023-06-06 10:32:11 +08:00
lingfeng 0372fdac2a Merge commit '953fcf122254f606ec9df583b2500efffa357b49' into dev_glcc 2023-06-06 09:53:57 +08:00
lingfeng aaacf65e45 feat:check task 2023-06-05 17:49:55 +08:00
lingfeng 73a52d5f02 feat:check task 2023-06-05 17:46:47 +08:00
lingfeng 3ec984c312 feat:check task 2023-06-05 17:06:00 +08:00
lingfeng f714f2e5a9 feat:check task 2023-06-05 16:51:10 +08:00
lingfeng 40b104e925 Merge commit '2cc735912edbdbe02618961c557d187fe6ad11bf' into dev_glcc 2023-05-31 15:10:08 +08:00
lingfeng 146d70a24e 学生表也区别round 2023-05-31 10:02:40 +08:00
lingfeng 35d5cb6cb3 Merge commit 'b83a45f1e220cd66f0d48c325cb74058fbabdc37' into dev_glcc 2023-05-30 16:58:13 +08:00
lingfeng 489830b475 fix 2023-05-30 14:45:20 +08:00
lingfeng bc6ec7d975 Merge commit '25d5ce9683ee80238510295726d184c204e54244' into dev_glcc 2023-05-30 13:58:46 +08:00