Commit Graph

1196 Commits

Author SHA1 Message Date
孙广明
31ef3e0260 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480

See merge request easycorp/zentaopms!6498
2022-12-08 06:05:50 +00:00
lanzongjun
0f4ef051bf * Finish Bug #30480 2022-12-08 13:44:28 +08:00
xieqiyu
6038b69ea4 * Fix bug#30651. 2022-12-08 13:31:00 +08:00
lanzongjun
d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
wangyidong
3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
xieqiyu
a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +08:00
xieqiyu
afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
hufangzhou
871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00:00
孙广明
f06d508e16 * Finish task #78662. 2022-12-06 15:48:09 +08:00
Yagami
55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
Yagami
d7d897a8f7 * Fix code error. 2022-12-02 15:58:52 +08:00
王怡栋
d1952c69b0 Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6446
2022-12-02 02:47:20 +00:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08: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
Yagami
cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
wangyuting
2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
Yagami
7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08: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