Commit Graph
3104 Commits
Author SHA1 Message Date
王怡栋 d4ed48e790 Merge branch 'sprint/241_dyl_70018' into 'master'
* task #70018, change bug confirmed color.

See merge request easycorp/zentaopms!5467
2022-09-22 06:09:26 +00:00
dingyongliang c7c4ec7429 * task #70018, change bug confirmed color. 2022-09-22 01:12:16 +00:00
王怡栋 ecbb1e7b43 Merge branch 'feedback_953' into 'master'
* Code for feedback#953

See merge request easycorp/zentaopms!5441
2022-09-21 05:20:56 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
zenggang 943e27d41c * Code for feedback#953 2022-09-21 02:05:58 +00:00
zenggang 0dcf0dfa0d * Code for feedback#835 2022-09-15 07:41:47 +00:00
tanghucheng 714dffe615 * Fix bug for bug export. 2022-09-14 14:42:44 +08:00
tianshujie 226029f1e5 * Fix bug #27451. 2022-09-09 16:34:08 +08:00
tianshujie b5630098eb * Fix bug #27449. 2022-09-09 16:10:34 +08:00
王怡栋 b9564e50a1 Merge branch 'master_xieqiyu_27124' into 'master'
Master xieqiyu 27124

See merge request easycorp/zentaopms!5300
2022-09-09 07:17:43 +00:00
xieqiyu dfe4de62a5 * Fix bug#26179. 2022-09-09 14:14:53 +08:00
xieqiyu a258b7b9db * Fix bug#26156. 2022-09-09 14:11:36 +08:00
tianshujie e9efb56769 * Fix bug #27437. 2022-09-09 10:37:28 +08:00
xieqiyu 5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu 97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
xieqiyu 592a109bed * Code for task#67691. 2022-09-08 09:09:03 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
王怡栋 19d5097ff3 Merge branch 'sprint/daitingting_optimize' into 'master'
* Optimize codes.

See merge request easycorp/zentaopms!5269
2022-09-06 05:44:51 +00:00
daitingting dc0ecc890e * Optimize codes. 2022-09-06 05:26:47 +00:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
lanzongjun 91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
王怡栋 48e11d5186 Merge branch 'sprint/hufangzhou_26458' into 'master'
* Fix bug #26458.

See merge request easycorp/zentaopms!5230
2022-09-01 06:53:53 +00:00
王怡栋 58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu 16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
hufangzhou def6b278e9 * Fix bug #26458. 2022-09-01 10:50:45 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
lanzongjun 07c97f4072 modify processed 2022-09-01 09:40:57 +08:00
lanzongjun 71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun 11ace1e2da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-09-01 09:11:23 +08:00
lanzongjun 1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00
xieqiyu e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
xieqiyu b026b7c494 * Code for task#66955. 2022-08-31 18:27:42 +08:00
李玉春 0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
tianshujie b9190b8d92 * Solve bug link bug search all products reported errors. 2022-08-30 15:14:36 +08:00
zenggang 6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
王怡栋 c6f4f5445f Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug flex

See merge request easycorp/zentaopms!5196
2022-08-30 06:36:30 +00:00
lanzongjun 8dc6585522 * fix bug flex 2022-08-30 14:35:05 +08:00
zenggang 062af71ff8 * Fix sprint231 bugs 2022-08-29 07:23:32 +00:00
王怡栋 61999b0462 Merge branch 'master_xieqiyu_26991' into 'master'
* Fix bug#26991.

See merge request easycorp/zentaopms!5179
2022-08-29 05:38:16 +00:00
王怡栋 20ac7bdecb Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26983

See merge request easycorp/zentaopms!5175
2022-08-29 05:32:26 +00:00
xieqiyu 97369a949c * Fix bug#26897. 2022-08-29 13:31:54 +08:00
lanzongjun c26a7c3a3a * fix bug #26990 2022-08-29 13:28:13 +08:00
xieqiyu fe9228b394 * Fix bug#26897. 2022-08-29 13:26:58 +08:00
xieqiyu c3ba9e70ae * Fix bug#26897. 2022-08-29 13:26:11 +08:00
lanzongjun e8ffd8d912 * fix bug #26983 2022-08-29 11:13:46 +08:00
曾刚 72194dcc1a * Fix bug#26939 2022-08-29 02:55:19 +00:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
王怡栋 7ad4d9edfe Merge branch 'master_liuhong_66222' into 'master'
*Fix bug #66222.

See merge request easycorp/zentaopms!5132
2022-08-26 02:10:26 +00:00
liuhong 18f392ac88 *Fix bug #66222. 2022-08-26 01:48:39 +00:00