Commit Graph
1519 Commits
Author SHA1 Message Date
王怡栋 99f6d0f16f Merge branch 'sprint/master_zhouxudong_56918' into 'master'
* Finish task #56918.

See merge request easycorp/zentaopms!3929
2022-06-15 05:33:58 +00:00
zhouxudong a5f8fdaef3 * Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918.* Finish task #56918. 2022-06-15 01:42:32 +00:00
zhouxudong 6dc1ecfa95 * Finish task #56918. 2022-06-14 08:08:52 +00:00
王怡栋 dce5aa0a23 Merge branch 'sprint/master_zhouxudong_56915' into 'master'
Sprint/master zhouxudong 56915

See merge request easycorp/zentaopms!3909
2022-06-14 07:18:50 +00:00
tanghucheng 1f1b79948a * Finish story #33374. 2022-06-14 15:03:36 +08:00
zhouxudong 1ad55fdd08 * Finish task #56915. 2022-06-14 06:39:25 +00:00
zhouxudong 50571ec217 * Finish task #56915. 2022-06-14 03:13:14 +00:00
zhouxudong fa4d314709 * Finish task #56915. 2022-06-14 01:09:07 +00:00
孙广明 a42ef81a50 Merge branch 'fixbug_sunjun_23572' into 'master'
fixbug_sunjun_23572

See merge request easycorp/zentaopms!3874
2022-06-13 00:54:52 +00:00
sunjun c8bf2f2e67 fixbug_sunjun_23572 2022-06-13 00:17:47 +00:00
zhouxin 619e31e6f9 * Fix issue. 2022-06-10 08:10:41 +00:00
sunjun 41c6a655a2 fixbug_requirement 2022-06-10 05:24:15 +00:00
sunjun e21aff2d5d sprint_sunjun_201 2022-06-10 04:29:30 +00:00
李玉春 15812a5cb1 Merge branch '201_zhouxin_56467' into 'master'
201 zhouxin 56467

See merge request easycorp/zentaopms!3853
2022-06-10 02:53:00 +00:00
zhouxin d1e3ba6c5e * Adjust code. 2022-06-10 02:46:45 +00:00
mayue e11b76d819 * Ajust mutual test issue. 2022-06-10 10:23:27 +08:00
zhouxin c7aa2f7fff * Adjust code. 2022-06-10 01:43:10 +00:00
tianshujie baff0cf4fe * Optimize code. 2022-06-10 09:23:12 +08:00
zhouxin ee8af517fa * Finish task #56467. 2022-06-10 01:22:12 +00:00
孙广明 4e40722b6d Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!3845
2022-06-10 01:08:31 +00:00
王怡栋 fad3f54c7b Merge branch 'sprint/201_tianshujie_56460' into 'master'
* Finish task #56460.

See merge request easycorp/zentaopms!3844
2022-06-10 01:07:17 +00:00
mayue a08bd00371 * Optimize code. 2022-06-10 09:05:33 +08:00
孙广明 45d130f354 Merge branch 'sprint199_zg' into 'master'
* Finish task#56549,56552

See merge request easycorp/zentaopms!3842
2022-06-10 01:03:54 +00:00
孙广明 4d07a2d45b Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Finish task #56550,56553.

See merge request easycorp/zentaopms!3840
2022-06-10 01:02:07 +00:00
zenggang 8c5c2f2149 * Finish task#56549,56552 2022-06-10 00:51:11 +00:00
孙广明 f02350122a Merge branch 'liyuchun_56551' into 'master'
Liyuchun 56551

See merge request easycorp/zentaopms!3822
2022-06-09 09:21:32 +00:00
mayue edda32ba72 * Finish task #56550,56553. 2022-06-09 17:15:44 +08:00
zhouxin 367ed5c190 * Adjust code. 2022-06-09 08:59:56 +00:00
zhouxin 5500e2fb58 * Fix bug for task #56458. 2022-06-09 08:54:56 +00:00
liyuchun bd2503c558 Merge branch 'liyuchun_56551' of https://gitlab.zcorp.cc/easycorp/zentaopms into liyuchun_56551 2022-06-09 06:00:44 +00:00
liyuchun 975088c89d * Adjust task width. 2022-06-09 05:59:43 +00:00
tianshujie d816ba77c0 * Finish task #56460. 2022-06-09 13:23:32 +08:00
zhouxin c056b7e567 * Finish task #56461,56462,56458,56465. 2022-06-09 05:18:27 +00:00
孙广明 07591cfd0f Merge branch 'sprint_201_56459' into 'master'
Sprint 201 56459

See merge request easycorp/zentaopms!3802
2022-06-09 00:35:28 +00:00
sunjun 283df0a7b8 sprint_201_56459 2022-06-08 13:50:36 +00:00
sunjun 305c6ee543 sprint_201_56459 2022-06-08 08:59:25 +00:00
sunjun 16e24ac37a sprint_201_56459 2022-06-08 07:08:25 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
zenggang bb0cd23f51 * Adjust code 2022-05-27 07:33:26 +00:00
孙华伟 8caf05257c *Fix bug #22989. 2022-05-26 15:27:54 +08:00
zenggang c1f648d22a * Fix bug#22957 2022-05-26 05:36:53 +00:00
zenggang 33a23e09c5 * Finish task#55172 2022-05-25 02:51:17 +00:00
sunjun 7174926385 fixbug 2022-05-20 05:25:11 +00:00
sunjun 8fe60b85d0 fixbug 2022-05-20 05:14:35 +00:00
sunjun e1acea800f fixbug_sunjun_22695 2022-05-20 05:11:52 +00:00
李玉春 2eaf30a558 Merge branch 'fixbug_sunjun_22696' into 'master'
fixbug_sunjun_22696

See merge request easycorp/zentaopms!3539
2022-05-20 03:02:22 +00:00
sunjun ef9f67f252 fixbug 2022-05-20 02:55:37 +00:00
sunjun a466ea1c01 fixbug 2022-05-20 02:53:04 +00:00