Commit Graph
2363 Commits
Author SHA1 Message Date
李玉春 ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
tianshujie b4a394718f * Finish task #62947. 2022-08-03 14:49:42 +08:00
tianshujie 6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +08:00
liumengyi 2c108bcf16 * Fix bug #25987. 2022-08-03 14:06:17 +08:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
liumengyi fc60a3f503 * Fix bug #25964. 2022-08-03 13:16:42 +08:00
王怡栋 1d59e34b07 Merge branch 'sprint/221_zg' into 'master'
Sprint/221 zg

See merge request easycorp/zentaopms!4751
2022-08-03 02:12:38 +00:00
王怡栋 9bb4369d7b Merge branch 'sprint/221_liumengyi_62935' into 'master'
* Finish task #62935.

See merge request easycorp/zentaopms!4748
2022-08-03 01:21:03 +00:00
liumengyi 6d019f65e5 * Fix bug for task #62935. 2022-08-03 08:39:25 +08:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
dongli b664ed8b43 * Fix bug #25851 2022-08-02 07:03:57 +00:00
dongli 80753ec1f0 * Fix bug #25851. 2022-08-02 06:41:48 +00:00
liumengyi dd2c92fb9d * Finish task #62935. 2022-08-01 15:41:14 +08:00
王怡栋 9f7bbb08f8 Merge branch 'sprint/master_zhouxudong_25841' into 'master'
* Fix bug #25841.

See merge request easycorp/zentaopms!4718
2022-07-28 08:51:09 +00:00
王怡栋 4f565e25f4 Merge branch 'sprint220_zg_23205' into 'master'
* Fix bug#62106

See merge request easycorp/zentaopms!4717
2022-07-28 08:50:56 +00:00
zhouxudong cae237887d * Fix bug #25841. 2022-07-28 08:36:12 +00:00
zenggang 92abbcfdf5 * Fix bug#62106 2022-07-28 08:03:40 +00:00
王怡栋 6a7e5939e3 Merge branch 'leiyong_fix_bug' into 'master'
* Fix bug#25807.

See merge request easycorp/zentaopms!4716
2022-07-28 07:59:29 +00:00
leiyong 4d63e9fc36 * Fix bug#25807. 2022-07-28 07:56:15 +00:00
王怡栋 6446c442de Merge branch 'sprint/220_liumengyi_25838' into 'master'
* Fix bug #25838.

See merge request easycorp/zentaopms!4714
2022-07-28 07:53:05 +00:00
liumengyi 51197d23c9 * Fix bug #25838. 2022-07-28 15:50:52 +08:00
zenggang dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
liumengyi a7568986c1 * Fix bug for change tab. 2022-07-28 14:21:28 +08:00
mayue 12fa7ecaec * Fix cfd issue. 2022-07-28 11:01:24 +08:00
liumengyi ad763d0fd5 * Optimize code for task #62494. 2022-07-28 10:04:05 +08:00
liumengyi 1375165c73 * Optimize code for task #62494. 2022-07-28 10:02:43 +08:00
liumengyi e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
liumengyi 60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
王怡栋 e74ddb9e4a Merge branch 'sprint/220_liumengyi_25782' into 'master'
* Fix bug #25782.

See merge request easycorp/zentaopms!4693
2022-07-27 08:59:41 +00:00
王怡栋 378fb33899 Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112

See merge request easycorp/zentaopms!4687
2022-07-27 08:59:23 +00:00
liumengyi 845da88b1d * Fix bug #25782. 2022-07-27 16:26:46 +08:00
孙广明 41e968cf34 Merge branch 'sprint/220_liumengyi_35409' into 'master'
* Finish task #62492, #62493, #62494.

See merge request easycorp/zentaopms!4691
2022-07-27 08:09:36 +00:00
liumengyi 352270909e * Finish task #62492, #62493, #62494. 2022-07-27 16:07:23 +08:00
王怡栋 ad6f2d86fd Merge branch 'sprint/master_zhouxudong_24318' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!4684
2022-07-27 07:22:38 +00:00
zhouxudong 3a251f99b6 * Fix bug #24318. 2022-07-27 07:09:12 +00:00
liumengyi 5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
liumengyi 757a39e21b * Fix issue #696. 2022-07-27 13:06:34 +08:00
liumengyi 0ba22df874 * Fix issue #695. 2022-07-27 13:06:12 +08:00
zhouxudong 38ae663640 * Fix bug #25703. 2022-07-27 01:52:04 +00:00
tianshujie a84a4098e9 * Fix bug #25721. 2022-07-26 17:18:35 +08:00
tianshujie a2f203990e * Fixed burnout chart display in execution list. 2022-07-26 17:05:13 +08:00
王怡栋 f4b971d877 Merge branch 'sprint/220_liumengyi_25699' into 'master'
* Fix bug #25699, #25700.

See merge request easycorp/zentaopms!4661
2022-07-26 08:16:38 +00:00
liumengyi 1284608659 * Fix bug #25700. 2022-07-26 16:06:57 +08:00
liumengyi 30b7ecbee7 * Fix bug #24009. 2022-07-26 16:02:47 +08:00
王怡栋 649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
孙广明 867f5467d9 * Fix bug #25678. 2022-07-26 13:20:41 +08:00
liumengyi a0a9d5e765 * Optimize for task #61971. 2022-07-26 12:02:28 +08:00
liumengyi e3d090d917 * Fix bug for task #61975. 2022-07-26 11:18:34 +08:00
liumengyi b67950c1ba * Fix bug for task #61973. 2022-07-26 10:27:08 +08:00