Commit Graph
44350 Commits
Author SHA1 Message Date
李玉春 ef485ceb59 Merge branch 'sprint/235_tianshujie_66996' into 'sprint/235'
* Change the highlight color of the area label.

See merge request easycorp/zentaopms!5215
2022-08-31 08:19:18 +00:00
tianshujie 87325381f6 * Change the highlight color of the area label. 2022-08-31 16:16:52 +08:00
王怡栋 b379600cd5 Merge branch 'sprint/235_dongli_bug66816' into 'sprint/235'
* Fix bug #66816.

See merge request easycorp/zentaopms!5207
2022-08-31 08:03:14 +00:00
李玉春 645cee0fc1 Merge branch 'sprint/235_tianshujie_66996' into 'sprint/235'
Sprint/235 tianshujie 66996

See merge request easycorp/zentaopms!5214
2022-08-31 08:00:34 +00:00
tianshujie 18413141c1 * Change the code style. 2022-08-31 15:55:17 +08:00
tianshujie 8077fe8a34 * Finish task #66996. 2022-08-31 15:39:53 +08:00
tianshujie b9190b8d92 * Solve bug link bug search all products reported errors. 2022-08-30 15:14:36 +08:00
dongli c93028b04e * Fix bug #66816. 2022-08-30 03:00:07 +00:00
孙广明 1e1ddeb0b0 Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235'
* Fix bug #26758,  #25942., #23957.

See merge request easycorp/zentaopms!5176
2022-08-29 06:53:31 +00:00
孙广明 508e251f76 Merge branch 'sprint/235_liumengyi_66938' into 'sprint/235'
* Finish task #66938, fix bug #25942.

See merge request easycorp/zentaopms!5174
2022-08-29 06:53:01 +00:00
tianshujie 0d4b77197f * Fix bug #26936. 2022-08-29 14:49:33 +08:00
liumengyi 0c55777578 * Fix bug #26846. 2022-08-29 14:40:00 +08:00
liumengyi a295a6d934 * Fix bug #23957. 2022-08-29 14:20:57 +08:00
liumengyi 44e42e9fd1 * Fix bug #25942. 2022-08-29 13:10:11 +08:00
tianshujie cf56fd3c55 * Fix bug #26758. 2022-08-29 11:12:50 +08:00
liumengyi 6db1eac73f * Finish task #66938. 2022-08-29 11:07:47 +08:00
liumengyi 7e60d43f6e * Finish task #66938. 2022-08-29 10:45:50 +08:00
孙广明 9722d6afd0 Merge branch 'sprint/235_tianshujie_26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5168
2022-08-29 02:25:42 +00:00
王怡栋 c2752a14ac Merge branch 'master_xieqiyu_26948' into 'master'
* Fix bug#26948.

See merge request easycorp/zentaopms!5166
2022-08-29 02:20:51 +00:00
王怡栋 9cfb3f6d10 Merge branch 'sprint/hufangzhou_26420' into 'master'
* Fix bug #26420.

See merge request easycorp/zentaopms!5165
2022-08-29 02:20:18 +00:00
王怡栋 4605fea6e2 Merge branch 'fixbug' into 'master'
* Fix bug #26924.

See merge request easycorp/zentaopms!5169
2022-08-29 02:19:10 +00:00
tanghucheng 5660267ec2 * Fix bug #26924. 2022-08-29 10:14:18 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
xieqiyu daafaea271 * Fix bug#26948. 2022-08-29 09:33:38 +08:00
hufangzhou 92e0ec8eae * Fix bug #26420. 2022-08-29 09:32:23 +08:00
wangyidong d859327126 * fix bug #26951. 2022-08-29 09:17:51 +08:00
王怡栋 29ccc1512c Merge branch 'sprint/231_dongli_bug24387' into 'master'
* Fix bug #24387.

See merge request easycorp/zentaopms!5164
2022-08-29 00:49:15 +00:00
王怡栋 8a22b73e0e Merge branch 'master_xieqiyu_26779' into 'master'
Master xieqiyu 26779

See merge request easycorp/zentaopms!5159
2022-08-29 00:49:03 +00:00
王怡栋 5d8309b24a Merge branch 'sprint231/zg_unit' into 'master'
* Sprint231 unit

See merge request easycorp/zentaopms!5160
2022-08-29 00:48:03 +00:00
王怡栋 36d2dce485 Merge branch 'sprint/231_tianshujie_26936' into 'master'
* Fix bug #26936.

See merge request easycorp/zentaopms!5158
2022-08-29 00:46:46 +00:00
王怡栋 c4c74ff325 Merge branch 'importExport' into 'master'
* Code for testcase import.

See merge request easycorp/zentaopms!5163
2022-08-29 00:45:30 +00:00
dongli 914ab9d955 * Delete useless files. 2022-08-28 13:28:59 +00:00
dongli 25fe8cd518 * Fix bug #24387. 2022-08-28 11:57:16 +00:00
tanghucheng 663434a666 * Code for story import. 2022-08-27 21:55:30 +08:00
zenggang 6c5c2a004f * Sprint231 unit 2022-08-26 09:38:31 +00:00
孙广明 72b130fb6c Merge branch 'sprint/231_liumengyi_26724' into 'master'
* Fix bug #26724.

See merge request easycorp/zentaopms!5157
2022-08-26 08:57:41 +00:00
xieqiyu e00f756381 * Fix bug#26779. 2022-08-26 16:47:57 +08:00
xieqiyu 34ec8c0a22 * Fix bug#26779. 2022-08-26 16:47:22 +08:00
tianshujie aa0f16c8e8 * Fix bug #26936. 2022-08-26 16:31:41 +08:00
liumengyi fac28b389a * Fix bug #26724. 2022-08-26 16:12:07 +08:00
孙广明 5b759d1676 Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5155
2022-08-26 07:46:16 +00:00
王怡栋 69674273fe Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5154
2022-08-26 07:45:42 +00:00
tianshujie eb6b6b061f * Fix bug #26950. 2022-08-26 15:34:18 +08:00
liumengyi 18efebc505 * Fix bug. 2022-08-26 15:33:46 +08:00
tianshujie e45c8da5c8 * Fix bug #26954. 2022-08-26 15:32:33 +08:00
tianshujie ae8f299b55 * Fix bug #26950. 2022-08-26 15:25:17 +08:00
王怡栋 7345d4e036 Merge branch 'fix_bug#26945' into 'master'
* Fix bug #26945.

See merge request easycorp/zentaopms!5153
2022-08-26 07:23:28 +00:00
mayue 3952e3d312 * Fix bug #26945. 2022-08-26 15:22:00 +08:00
王怡栋 5077173b8b Merge branch 'master_xieqiyu_26898' into 'master'
* Fix bug#26898.

See merge request easycorp/zentaopms!5152
2022-08-26 07:21:30 +00:00
tianshujie 12e8aebfb2 * Fix bug #26946. 2022-08-26 15:18:58 +08:00