Commit Graph
39009 Commits
Author SHA1 Message Date
李玉春 1f768098c6 Merge branch 'sprint/191_liumengyi_54354' into 'master'
Sprint/191 liumengyi 54354

See merge request easycorp/zentaopms!3461
2022-05-17 09:28:22 +00:00
liumengyi bff314e0d4 * Modify code for task #54354. 2022-05-17 17:26:17 +08:00
李玉春 782e860754 Merge branch 'sprint/191_liumengyi_54349' into 'master'
Sprint/191 liumengyi 54349

See merge request easycorp/zentaopms!3455
2022-05-17 09:18:05 +00:00
liumengyi 7d2ab19bc4 * Code format for task #54349. 2022-05-17 17:16:53 +08:00
孙广明 33de37f468 Merge branch 'sprint/190_zg_54192' into 'master'
* Finish task#54192,54196

See merge request easycorp/zentaopms!3449
2022-05-17 08:53:21 +00:00
zenggang 56363dbfeb * Adjust code 2022-05-17 08:52:33 +00:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
zenggang 5bb5dfce54 * Adjust code 2022-05-17 08:44:50 +00:00
王怡栋 e8fe05b744 Merge branch 'sprint/master_zhouxudong_54480' into 'master'
Sprint/master zhouxudong 54480

See merge request easycorp/zentaopms!3452
2022-05-17 08:38:03 +00:00
王怡栋 ec8d77bb19 Merge branch 'sgm_task54218' into 'master'
* Finish task #54218.

See merge request easycorp/zentaopms!3450
2022-05-17 08:37:13 +00:00
zenggang aef54696ec * Adjust code 2022-05-17 08:21:49 +00:00
zhouxudong 925aa3f8d8 * Finish task #54480. 2022-05-17 08:12:27 +00:00
孙广明 268d3c3bcf * Finish task #54218. 2022-05-17 16:04:39 +08:00
王怡栋 aa9924c41a Merge branch 'master_xieqiyu_54483' into 'master'
* Fix bug#54483.

See merge request easycorp/zentaopms!3445
2022-05-17 08:00:36 +00:00
zhouxudong bf6ba1ee20 * Finish task #54480. 2022-05-17 08:00:31 +00:00
王怡栋 32108b6ad2 Merge branch 'sgm_fixbug' into 'master'
* Fix jira and markdown bug.

See merge request easycorp/zentaopms!3444
2022-05-17 08:00:12 +00:00
王怡栋 8f67505c1f Merge branch 'sgm_sprint190' into 'master'
* Finish task #54194.

See merge request easycorp/zentaopms!3446
2022-05-17 07:59:22 +00:00
zhouxudong c097334f3b * Finish task #54480. 2022-05-17 07:58:26 +00:00
孙广明 3e8f38f27f Merge branch 'sprint/190_mayue_task#54191' into 'master'
* Optimize code task#54191.

See merge request easycorp/zentaopms!3448
2022-05-17 07:48:13 +00:00
mayue d0340d5666 * Optimize code. 2022-05-17 07:47:50 +00:00
zenggang 8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
mayue 22cc7108e2 * Optimize code task#54191. 2022-05-17 07:45:19 +00:00
王怡栋 61131a17f4 Merge branch 'sprint/wangyuting_fixbug' into 'master'
* Fix workflow default lang bug.

See merge request easycorp/zentaopms!3443
2022-05-17 07:43:37 +00:00
liumengyi 40f4e808da * Finish task #54354. 2022-05-17 15:43:15 +08:00
孙广明 930f625c7e Merge branch 'sprint/190_mayue_task#54191' into 'master'
* Finish task #54191.

See merge request easycorp/zentaopms!3447
2022-05-17 07:42:57 +00:00
zhouxudong cca3f56437 * Finish task #54480. 2022-05-17 07:38:22 +00:00
mayue 72f135d90b * Optimize code. 2022-05-17 07:35:26 +00:00
孙广明 1c9bfe9bd6 * Fix jira and markdown bug. 2022-05-17 15:10:28 +08:00
xieqiyu 39959d08e9 * Fix bug#54483. 2022-05-17 15:08:06 +08:00
mayue be47bb739c * Finish task #54191. 2022-05-17 07:06:36 +00:00
wangyuting2 d204f15d47 * Fix workflow default lang bug. 2022-05-17 14:56:44 +08:00
liumengyi 71cb47e7eb * Finish task #54349. 2022-05-17 14:51:13 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
孙广明 7ff5e4142b * Finish task #54194. 2022-05-17 13:22:07 +08:00
孙广明 3d3000f06f Merge branch 'sunhuawei_fixbug_22559' into 'master'
*Fix bug #22559.

See merge request easycorp/zentaopms!3439
2022-05-17 03:27:40 +00:00
孙华伟 628c54a838 *Optimize the code. 2022-05-17 11:26:35 +08:00
王怡栋 1ed6b45e30 Merge branch 'sgm_sprint190' into 'master'
Sgm sprint190

See merge request easycorp/zentaopms!3440
2022-05-17 03:20:36 +00:00
孙广明 59b7e2675c * Remove unused code. 2022-05-17 11:18:05 +08:00
孙广明 46e4eae295 * Finish task #54205. 2022-05-17 11:15:33 +08:00
孙华伟 9fad4e929b *Fix bug #22559. 2022-05-17 11:06:49 +08:00
王怡栋 670520548f Merge branch 'sprint/wangyuting_fixbug_22520' into 'master'
* Fix bug #22520

See merge request easycorp/zentaopms!3435
2022-05-17 03:03:53 +00:00
孙广明 f19a716ba0 Merge branch 'sunhuawei_fixbug_22375' into 'master'
*Fix bug #22375

See merge request easycorp/zentaopms!3438
2022-05-17 02:44:29 +00:00
孙广明 0d46d0144b Merge branch 'sunhuawei_task54210' into 'master'
*Fix bug #22338.

See merge request easycorp/zentaopms!3434
2022-05-17 02:42:28 +00:00
孙华伟 4bc08301f8 *Fix bug #22375 2022-05-17 10:40:11 +08:00
李玉春 743ba6a6da Merge branch 'sprint/191_tianshujie_54353' into 'master'
Sprint/191 tianshujie 54353

See merge request easycorp/zentaopms!3437
2022-05-17 02:38:25 +00:00
tianshujie 2ee1ea4b7a * Modifying judgment logic. 2022-05-17 10:36:41 +08:00
李玉春 bf512c437b Merge branch 'sprint/191_liumengyi_54336' into 'master'
* Finish task #54346,#54345.

See merge request easycorp/zentaopms!3436
2022-05-17 02:25:55 +00:00
liumengyi 566b87823f * Finish task #54346,#54345. 2022-05-17 10:07:26 +08:00
tianshujie d65a6ee4eb * Modify testcase of productplan model. 2022-05-17 09:58:49 +08:00
wangyuting2 faf8ee28b9 * Fix bug #22520 2022-05-17 09:58:28 +08:00