Commit Graph
1182 Commits
Author SHA1 Message Date
王怡栋 d1952c69b0 Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6446
2022-12-02 02:47:20 +00:00
wangyuting e100ad058c * Fix bug. 2022-12-01 09:03:16 +00:00
王怡栋 8047908575 Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30274.

See merge request easycorp/zentaopms!6445
2022-12-01 09:00:59 +00:00
wangyidong 8007950ef9 * fix bug #30274. 2022-12-01 16:59:45 +08:00
wangyuting 2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
王怡栋 c71b65d8b0 Merge branch 'zentaopms_266_task#77610' into 'master'
* Finish task #77610.

See merge request easycorp/zentaopms!6410
2022-11-30 02:06:19 +00:00
wangyuting 5c176595e4 * Finish task #77610. 2022-11-30 01:46:45 +00:00
孔令茂 e5cfde941d * Optimize project linkage on create bug page. 2022-11-29 13:20:50 +00:00
daitingting a2aa5c325a * Fix bug #30020. 2022-11-25 07:36:53 +00:00
xieqiyu d00e4f5978 * Fix bug#30233. 2022-11-25 09:06:19 +08:00
daitingting 07f1d12ef8 * Fix bug #30185. 2022-11-24 03:03:42 +00:00
Yagami 49581d7ece * Finish task #77252. 2022-11-23 13:43:06 +08:00
wangyuting 63a249eeca * Fix bug #30045. 2022-11-23 01:29:34 +00:00
孙广明 62f0dddafb Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix bug #30034

See merge request easycorp/zentaopms!6277
2022-11-22 00:36:58 +00:00
lanzongjun 968ba89c77 * Fix bug #30034 2022-11-21 14:09:30 +08:00
daitingting 84b1383820 * Display all products of the top program. 2022-11-21 02:12:42 +00:00
王怡栋 6164fa0c69 Merge branch 'zentaopms_258_bug#29959' into 'master'
* Fix bug #29959.

See merge request easycorp/zentaopms!6243
2022-11-18 07:18:30 +00:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
daitingting 6743a6e779 * Fix bug #29931. 2022-11-18 02:40:02 +00:00
wangyuting eb8f8bac5e * Fix bug #29692. 2022-11-16 05:29:40 +00:00
王怡栋 6fc2d1bd23 Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.

See merge request easycorp/zentaopms!6160
2022-11-15 08:31:10 +00:00
daitingting 37caf86461 * Fix bug #29665. 2022-11-15 06:58:54 +00:00
daitingting 8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
liuhong d7f9d55863 * Resolved feedback #1422. 2022-11-15 02:15:12 +00:00
Yagami 7bd15c19ce * Fix bug #75356. 2022-11-10 09:46:25 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting 8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting 16706253e7 * Finish task #73989, #73990. 2022-10-31 06:27:40 +00:00
daitingting 6a2200647e * Fix bug #29073. 2022-10-28 09:08:37 +00:00
Yagami 644e28c670 * Fix bug #29099. 2022-10-28 16:28:48 +08:00
wangyidong 7050943933 * fix bug #29017. 2022-10-28 15:25:17 +08:00
Yagami 1ec7f132ea * Code for edit product page. 2022-10-28 08:35:15 +08:00
daitingting c338b9a237 * Adjust codes. 2022-10-27 06:30:12 +00:00
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
唐胡成 122a34b4a5 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix bug #29016,#29006,#29020.

See merge request easycorp/zentaopms!5909
2022-10-27 03:19:48 +00:00
tanghucheng ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
孙广明 7a4179a210 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Finish task #73241.

See merge request easycorp/zentaopms!5889
2022-10-27 01:03:26 +00:00
tanghucheng d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
Yagami 2f04710843 * Finish task #73233. 2022-10-26 15:41:53 +08:00
daitingting fd288a6a3c * Finish task #71566,#71567,#72987. 2022-10-25 08:20:29 +00:00
Yagami 1875b5be0e * Fix bug #73233. 2022-10-25 09:25:07 +08:00
wangyuting2 ee4ffb51eb * Optimize code. 2022-10-24 08:49:37 +00:00
Yagami c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
daitingting ea9b26e581 * Finish task #71574. 2022-10-21 00:52:14 +00:00
wangyuting2 05f6ade106 * Finish task #71569. 2022-10-20 08:30:23 +00:00
Yagami 646dcaec32 * Finish task #72677. 2022-10-20 13:22:07 +08:00
王怡栋 15125e7cd1 Merge branch 'zentaopms_239_task#72763' into 'zentaopms_239'
* Finish task #72763 ~ #72772.

See merge request easycorp/zentaopms!5792
2022-10-19 05:27:22 +00:00
wangyuting2 49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +00:00