Commit Graph
43962 Commits
Author SHA1 Message Date
tianshujie dca2784559 * Finish task #65808. 2022-08-23 15:02:57 +08:00
liumengyi 545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
tianshujie 976de6e849 * Fix the problem of error reporting in the contribution task list. 2022-08-23 14:17:43 +08:00
liumengyi cc92f9d3ef * Optimize code. 2022-08-23 13:54:29 +08:00
liumengyi 617122882a * Finish task #65807. 2022-08-23 13:45:44 +08:00
tianshujie 4e1ca8bd60 * Finish task #65808. 2022-08-23 13:40:34 +08:00
tianshujie d8a419798d * Fix bug #26728. 2022-08-22 14:47:40 +08:00
孙广明 aade6c4499 Merge branch 'sprint/231_liumengyi_26723' into 'master'
* Fix bug #26723.

See merge request easycorp/zentaopms!5045
2022-08-22 03:30:03 +00:00
liumengyi 20041ea696 * Fix bug #26723. 2022-08-22 11:12:38 +08:00
王怡栋 e28e4e8981 Merge branch 'importExport' into 'master'
* Fix bug #26714.

See merge request easycorp/zentaopms!5044
2022-08-22 02:47:35 +00:00
tanghucheng 17f08b4b70 * Fix bug #26714. 2022-08-22 10:46:13 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
liumengyi f5f452bb39 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:06:52 +08:00
liumengyi f42d3690c5 * Finish task #64967. 2022-08-22 10:06:05 +08:00
tianshujie 8916862314 Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 10:02:04 +08:00
tianshujie 060a2d9df0 * Finish task #64967. 2022-08-22 10:01:53 +08:00
liumengyi 5137289dd8 * Fix bug for task #64967. 2022-08-22 09:47:53 +08:00
王怡栋 a232caa81b Merge branch 'sprint/lanzongjun_testunit' into 'master'
testcase user and my

See merge request easycorp/zentaopms!5036
2022-08-22 01:40:39 +00:00
王怡栋 25bb8d8810 Merge branch 'notify_email' into 'master'
* Adjust style

See merge request easycorp/zentaopms!5041
2022-08-22 01:39:56 +00:00
王怡栋 81aae6a252 Update model.php 2022-08-22 01:34:24 +00:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
王怡栋 a4c474011c Merge branch 'sprint/master_zhouxudong_updateCode' into 'master'
* Optimization task #64887.

See merge request easycorp/zentaopms!5033
2022-08-22 01:29:07 +00:00
tianshujie 6bbff6043e Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-22 09:24:30 +08:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08:00
王怡栋 f8fa7dc0c9 Merge branch 'spritn/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5034
2022-08-22 01:23:30 +00:00
liumengyi ee19dd6d4a * Fix bug for task #64967. 2022-08-22 09:22:39 +08:00
zenggang 7ebf86134f * Adjust style 2022-08-19 08:37:39 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
tianshujie c990e09f61 * Finish task #64967. 2022-08-19 16:29:53 +08:00
liyuchun f51cd775ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-19 16:01:03 +08:00
liyuchun 806bc627ed * Remove sql. 2022-08-19 16:00:49 +08:00
王怡栋 4a7b95fbe0 Merge branch 'sprint/228_tianshujie_kanban' into 'master'
* Fixed bug where Kanban prompts for newline under execution.

See merge request easycorp/zentaopms!5038
2022-08-19 07:55:38 +00:00
tianshujie 5eb41bedef * Fixed bug where Kanban prompts for newline under execution. 2022-08-19 15:53:08 +08:00
lanzongjun 74513c5612 * module user testcase 2022-08-19 15:43:52 +08:00
lanzongjun 32dc102be8 * module user testcase 2022-08-19 15:42:33 +08:00
liyuchun cb2b5d9e24 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-19 15:42:01 +08:00
liyuchun fc4615e871 * Adjust style in repo maintain. 2022-08-19 15:40:00 +08:00
lanzongjun 7bed3e82f7 * module my testcase 2022-08-19 15:31:49 +08:00
lanzongjun 34bdbdaf79 * module my testcase 2022-08-19 15:30:53 +08:00
lanzongjun 1148c6fdf6 * module my testcase 2022-08-19 15:28:41 +08:00
lanzongjun b0943b567d * module my testcase 2022-08-19 15:27:43 +08:00
李玉春 dbf11ab4da Merge branch 'app_bug' into 'master'
* Modify control params.

See merge request easycorp/zentaopms!5035
2022-08-19 07:23:46 +00:00
caoyanyi 634342230f * Modify control params. 2022-08-19 15:22:12 +08:00
lanzongjun c0c981a1f6 * module my testcase 2022-08-19 15:16:09 +08:00
李玉春 550865ae3c Merge branch 'sprint/228_tianshujie_bug26339' into 'master'
* Fix bug #26339.

See merge request easycorp/zentaopms!5031
2022-08-19 06:59:19 +00:00
zhouxudong 000f8842e8 * Fix bug. 2022-08-19 06:55:39 +00:00
tianshujie 0b1327902b * Finish task #63696. 2022-08-19 14:45:10 +08:00
zhouxudong f3b134581f * Optimization task #64887. 2022-08-19 06:43:38 +00:00
tianshujie 36347984e3 * Finish task #64967. 2022-08-19 14:41:30 +08:00
tianshujie 2cccab4c6b Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967 2022-08-19 14:02:06 +08:00