crowd_intelligence
/
gitlink-glcc
mirror of https://gitlink.org.cn/Gitlink/GLCC.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
522 Commits 2 Branches 0 Tags 55 MiB
Commit Graph

522 Commits

Author SHA1 Message Date
huaxia2002 2c5edea8df 新增lockedAuditList去除了sub_round的筛选条件 2023-08-02 11:06:31 +08:00
huaxia2002 8ef25f9d2c round匹配变量修正 2023-08-01 17:34:21 +08:00
lingfeng 0564497827 0元项目 2023-06-30 15:01:58 +08:00
lingfeng dd85739106 Merge commit 'c757a477c6c40aecf4480d14556d11e69dfeef2a' into dev_glcc 2023-06-30 10:39:08 +08:00
lingfeng c757a477c6 Squashed 'share-api/src/main/resources/static/admin/' changes from c599d67..c1069cb 
c1069cb 搜索课题

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: c1069cb3cc6b30a1d1d5343f06a1cf00b02d43c1
 2023-06-30 10:39:08 +08:00
lingfeng a87987fb0a 0元项目 2023-06-30 10:04:01 +08:00
lingfeng b8ee768468 0元项目 2023-06-30 09:29:43 +08:00
lingfeng bd49545063 0元项目sql 2023-06-29 17:01:45 +08:00
lingfeng 2124b3040c Squashed 'share-api/src/main/resources/static/admin/' changes from d2600e5..c599d67 
c599d67 学生课题匹配

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: c599d67f7c9cdf55a95c53daf3f18dff1d0e698c
 2023-06-29 16:34:23 +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 6b664fdf02 authMatch 2023-06-28 12:03:11 +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 bfab7b89df Squashed 'share-api/src/main/resources/static/admin/' changes from a908ba86..d2600e5b 
d2600e5b 学生课题匹配

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: d2600e5b5b84647a959d0fcbb2652e21dc82d046
 2023-06-27 14:54:05 +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 2a1756ec75 Squashed 'share-api/src/main/resources/static/admin/' changes from acfd663..a908ba8 
a908ba8 学生课题匹配

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: a908ba86443eabde737ab05a3347ed7b261fb4f7
 2023-06-27 11:36:29 +08:00
lingfeng b15370a699 fix 2023-06-27 11:24:46 +08:00
lingfeng 9ac570714c fix 2023-06-27 10:53:20 +08:00
lingfeng d82ec7904c Squashed 'share-api/src/main/resources/static/admin/' changes from ee6e1cd..acfd663 
acfd663 学生课题匹配

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: acfd6630e213ca2d2dbf392715f6bea833048cfc
 2023-06-27 10:45:11 +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 ac00b02e34 sub_round 2023-06-27 09:59:15 +08:00
lingfeng d5597bf0eb Squashed 'share-api/src/main/resources/static/admin/' changes from e2ace24..ee6e1cd 
ee6e1cd 学生课题匹配

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: ee6e1cdaf220d0ecf7e352c5810118e207359dcb
 2023-06-27 09:35:22 +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 d4bf103f99 项目管理员可见 2023-06-25 09:40:03 +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 b47d078f29 @ExcelProperty(value = "审核状态") 2023-06-15 09:37:41 +08:00
lingfeng 1268e5b955 pageAuditList fix 2023-06-14 15:33:57 +08:00
lingfeng b06910f577 pageAuditList fix 2023-06-14 15:33:26 +08:00
lingfeng d7c43bf888 Squashed 'share-api/src/main/resources/static/admin/' changes from 59636fe..e2ace24 
e2ace24 导出课题信息

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: e2ace24db10cba4f60711133c658fe3465d2d825
 2023-06-14 10:32:38 +08:00
lingfeng 1c04c04801 Merge commit 'd7c43bf888f01ab0ca39011e3578b9d98fa6ae62' into dev_glcc 2023-06-14 10:32:38 +08:00
lingfeng 465be9aa3a exportTask 2023-06-13 17:12:44 +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 db4a2792b2 Squashed 'share-api/src/main/resources/static/admin/' changes from 8d1c2e17..59636fe9 
59636fe9 判断用户身份

git-subtree-dir: share-api/src/main/resources/static/admin
git-subtree-split: 59636fe96f30c629d21334933880a506bfd63954
 2023-06-13 10:12:34 +08:00