Commit Graph
33880 Commits
Author SHA1 Message Date
孙广明 3a1d6a8982 Merge branch 'fixbug_23694' into 'master'
fixbug_23694

See merge request easycorp/zentaopms!3971
2022-06-16 06:36:28 +00:00
孙广明 e0764d4248 Merge branch 'fixbug_sunjun_23810' into 'master'
Fixbug sunjun 23810

See merge request easycorp/zentaopms!3977
2022-06-16 06:36:10 +00:00
sunjun 977a81d359 fixbug_sunjun_23810 2022-06-16 06:31:49 +00:00
liumengyi e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00
王怡栋 85890a4b13 Merge branch 'sprint/204_tianshujie_fixbug' into 'master'
Sprint/204 tianshujie fixbug

See merge request easycorp/zentaopms!3973
2022-06-16 06:00:49 +00:00
王怡栋 adb2f62df6 Merge branch 'sprint/master_zhouxudong_23787' into 'master'
* Fix bug #23787.

See merge request easycorp/zentaopms!3962
2022-06-16 05:59:06 +00:00
zhouxudong b7764e1518 * Fix bug #23787. 2022-06-16 05:55:43 +00:00
xieqiyu d246bca164 * Fix bug#23655. 2022-06-16 13:49:47 +08:00
sunjun 7dfc3f64a2 fixbug_sunjun_23810 2022-06-16 05:49:32 +00:00
tanghucheng ab9657abf9 * Fix bug #23832. 2022-06-16 13:49:10 +08:00
xieqiyu e33c963505 * Fix bug#23829. 2022-06-16 13:33:23 +08:00
tianshujie b1f29eed4e * Fix bug #23815. 2022-06-16 13:30:59 +08:00
tianshujie d351c15090 * Fix bug #23828. 2022-06-16 13:23:57 +08:00
孙广明 bfa7047dff Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3970
2022-06-16 05:17:36 +00:00
sunjun e2e1bddf96 fixbug_23694 2022-06-16 05:17:24 +00:00
孙广明 ef6f5e0eec * Code for testcase view page display bug style. 2022-06-16 13:15:57 +08:00
孙广明 31838f2a25 * Fix bug #23704. 2022-06-16 13:08:56 +08:00
王怡栋 ae6f603d1e Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban's setLane.

See merge request easycorp/zentaopms!3969
2022-06-16 05:02:33 +00:00
王怡栋 f6283ff3b6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Changing variable names.

See merge request easycorp/zentaopms!3967
2022-06-16 05:01:29 +00:00
zhouxudong 85fc6dec5d * Fix bug about kanban's setLane. 2022-06-16 04:05:54 +00:00
caoyanyi 8d16be79c4 * Modify page locate. 2022-06-16 12:04:06 +08:00
tianshujie 604996bcae * Changing variable names. 2022-06-16 11:38:32 +08:00
王怡栋 9f7840a2d7 Merge branch 'sprint/204_liumengyi_677' into 'master'
* Fix issue #677.

See merge request easycorp/zentaopms!3966
2022-06-16 03:28:18 +00:00
liumengyi d369332447 * Fix issue #677. 2022-06-16 11:25:41 +08:00
王怡栋 497c737e91 Merge branch 'sprint/201_tianshujie_57095' into 'master'
Sprint/201 tianshujie 57095

See merge request easycorp/zentaopms!3964
2022-06-16 03:24:29 +00:00
tianshujie 65c9254f7c * Resolve issue #677. 2022-06-16 11:22:15 +08:00
xieqiyu e2361820ba * Fix bug#56936. 2022-06-16 11:13:17 +08:00
tianshujie 6848485eb4 * Finish task #57095. 2022-06-16 11:05:01 +08:00
李玉春 a3440508a4 Merge branch 'sprint/wangzemei/23705' into 'master'
* fix bug 23705

See merge request easycorp/zentaopms!3940
2022-06-16 03:04:15 +00:00
孙广明 1315cf7ea8 Merge branch 'sgm_details' into 'master'
Sgm details

See merge request easycorp/zentaopms!3963
2022-06-16 02:48:43 +00:00
孙广明 3ead38f9f2 * Fix traincourse bug. 2022-06-16 10:48:09 +08:00
tianshujie b3e240eda5 * Finish task #57095. 2022-06-16 10:29:31 +08:00
tianshujie da9801d9eb * Finish task #57095. 2022-06-16 09:08:05 +08:00
王怡栋 e92b1f1f4c Merge branch 'sprint/201_tianshujie_57095' into 'master'
* Finish task #57095.

See merge request easycorp/zentaopms!3961
2022-06-16 01:04:21 +00:00
王怡栋 504319fcef Merge branch 'leiyong_fix_bug_23735' into 'master'
* Fix bug#23793.

See merge request easycorp/zentaopms!3953
2022-06-16 01:03:22 +00:00
wangzemei ea0aeec4e8 * delete space 2022-06-16 00:57:37 +00:00
zhouxudong 1e7d999598 * Fix bug #23787. 2022-06-16 00:55:34 +00:00
tianshujie 061e25fd51 * Finish task #57095. 2022-06-16 08:53:15 +08:00
wangzemei 1ccd06777c * delete extra code about 23705 2022-06-16 00:46:27 +00:00
王怡栋 bd1c3b58aa Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix contacts style for different theme.

See merge request easycorp/zentaopms!3960
2022-06-16 00:37:54 +00:00
王怡栋 26ab6bfb4c Merge branch 'leiyong_fix_bug_23432' into 'master'
* Finish task#56932.

See merge request easycorp/zentaopms!3958
2022-06-16 00:37:19 +00:00
王怡栋 a79c6bab16 Merge branch 'master_xieqiyu_23657' into 'master'
* Fix bug#23657.

See merge request easycorp/zentaopms!3957
2022-06-16 00:36:14 +00:00
王怡栋 50b9d3013a Merge branch 'master_xieqiyu_23724' into 'master'
* Fix bug#23724.

See merge request easycorp/zentaopms!3956
2022-06-16 00:35:46 +00:00
zhouxudong d31dbf6002 * Fix contacts style for different theme. 2022-06-16 00:33:27 +00:00
王怡栋 06a6d3f112 Merge branch 'sprint/master_zhouxudong_23687' into 'master'
* Fix bug #23687.

See merge request easycorp/zentaopms!3950
2022-06-16 00:31:01 +00:00
王怡栋 513b348c7b Merge branch 'sprint/201_tianshujie_57095' into 'master'
* Finish task #57095.

See merge request easycorp/zentaopms!3959
2022-06-16 00:28:58 +00:00
孙广明 8db0b61c87 Merge branch 'sprint_204_57091' into 'master'
Sprint 204 57091

See merge request easycorp/zentaopms!3948
2022-06-16 00:28:26 +00:00
tianshujie cdc590c16b * Finish task #57095. 2022-06-16 08:27:34 +08:00
xieqiyu 16ea32d744 * Fix bug#23657. 2022-06-16 08:18:00 +08:00
sunjun d0dfc61e48 sprint_57091 2022-06-15 14:25:01 +00:00