Commit Graph
48274 Commits
Author SHA1 Message Date
王怡栋 3d00d28310 Merge branch 'zentaopms_263_bug#30132' into 'master'
* Fix bug #30132.

See merge request easycorp/zentaopms!6363
2022-11-24 06:47:55 +00:00
王怡栋 818bdf7a92 Merge branch 'zentaopms_263_bug#30130' into 'master'
* Fix bug #30130.

See merge request easycorp/zentaopms!6361
2022-11-24 06:43:30 +00:00
王怡栋 e61f5eb9c0 Merge branch 'master_xieqiyu_30105' into 'master'
* Fix bug#30105.

See merge request easycorp/zentaopms!6360
2022-11-24 06:43:14 +00:00
wangyuting cf769403ea * Fix bug #30132. 2022-11-24 06:17:14 +00:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
wangyuting 9cbbc919f6 * Fix bug #30130. 2022-11-24 05:45:13 +00:00
xieqiyu a640d56e39 * Fix bug#30105. 2022-11-24 13:37:35 +08:00
孙广明 55a42af328 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30180

See merge request easycorp/zentaopms!6359
2022-11-24 05:29:31 +00:00
lanzongjun f47d9fcb18 * Fix Bug #30180 2022-11-24 13:19:02 +08:00
Yagami 89d1dd2a3a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-24 13:15:40 +08:00
Yagami 9b0881dd5e * Fix bug for project unlink product. 2022-11-24 13:15:26 +08:00
王怡栋 cbeb50efbb Merge branch 'zentaopms_263_bug#30033' into 'master'
* Fix bug #30033.

See merge request easycorp/zentaopms!6358
2022-11-24 05:09:30 +00:00
王怡栋 2987e7be7f Merge branch 'zentaopms_263_wangyuting4' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6357
2022-11-24 05:09:04 +00:00
wangyuting 7b531573d9 * Optimize code. 2022-11-24 05:03:27 +00:00
wangyuting 3075732c2b * Fix bug #30033. 2022-11-24 05:01:52 +00:00
wangyuting 7eb8983e96 * Fix bug. 2022-11-24 03:21:12 +00:00
王怡栋 2e61421432 Merge branch 'zentaopms_263_bug#30202' into 'master'
* Fix bug #30202.

See merge request easycorp/zentaopms!6356
2022-11-24 03:20:59 +00:00
王怡栋 6150a7ad89 Merge branch 'bug_25845' into 'master'
* Fix bug#25845

See merge request easycorp/zentaopms!6355
2022-11-24 03:20:48 +00:00
王怡栋 b27dc93eec Merge branch 'zentaopms_263_bug_#30185' into 'master'
* Fix bug #30185.

See merge request easycorp/zentaopms!6354
2022-11-24 03:20:32 +00:00
王怡栋 d1bcfc58e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-24 11:18:02 +08:00
王怡栋 dc664a3e7a Merge branch 'sprint/master_lanzongjun_fixbug' 2022-11-24 11:17:26 +08:00
王怡栋 abfd5fbeb4 Merge branch 'zentaopms_263_bug_#30171' into 'master'
* Fix bug #30171.

See merge request easycorp/zentaopms!6352
2022-11-24 03:13:22 +00:00
wangyuting 2399c0060b * Fix bug #30202. 2022-11-24 03:09:57 +00:00
zenggang a37adad9f6 * Fix bug#25845 2022-11-24 03:09:19 +00:00
daitingting 07f1d12ef8 * Fix bug #30185. 2022-11-24 03:03:42 +00:00
lanzongjun aca9b1777f * Fix Bug #30180 2022-11-24 10:59:52 +08:00
daitingting b4296bb71e * Fix bug #30171. 2022-11-24 02:52:17 +00:00
王怡栋 f97c94bbde Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix project edit width

See merge request easycorp/zentaopms!6351
2022-11-24 02:18:44 +00:00
lanzongjun 9f692f5b23 * Fix project edit width 2022-11-24 10:17:44 +08:00
王怡栋 f531d46441 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30156

See merge request easycorp/zentaopms!6340
2022-11-24 02:14:55 +00:00
王怡栋 eaed2e5448 Merge branch 'zentaopms_264_bug#30193' into 'master'
* Fix bug #30193.

See merge request easycorp/zentaopms!6350
2022-11-24 02:14:14 +00:00
王怡栋 76d3ca3192 Merge branch 'fixbug' into 'master'
* Fix feedback #1530.

See merge request easycorp/zentaopms!6349
2022-11-24 02:13:37 +00:00
王怡栋 ce938d8d39 Merge branch 'master_xieqiyu_30188' into 'master'
* Fix bug#30188.

See merge request easycorp/zentaopms!6348
2022-11-24 02:13:17 +00:00
王怡栋 fb9bdee652 Merge branch 'zentaopms_263_bug_#30174' into 'master'
* Fix bug #30174.

See merge request easycorp/zentaopms!6347
2022-11-24 02:12:55 +00:00
王怡栋 29ff77d40b Merge branch 'master_xieqiyu_30187' into 'master'
* Fix bug#30187.

See merge request easycorp/zentaopms!6346
2022-11-24 02:12:37 +00:00
王怡栋 4ab2d6319c Merge branch 'zentaopms_263_bug#30132' into 'master'
* Fix bug #30132.

See merge request easycorp/zentaopms!6345
2022-11-24 02:12:05 +00:00
wangyuting 84f9b7b36a * Fix bug #30193. 2022-11-24 02:12:02 +00:00
王怡栋 ec42a8daec Merge branch 'cyy_bug' into 'master'
* Modify html style.

See merge request easycorp/zentaopms!6344
2022-11-24 02:11:50 +00:00
王怡栋 2dcd625a37 Merge branch 'zentaopms_263_bug#30138' into 'master'
* Fix bug #30138.

See merge request easycorp/zentaopms!6342
2022-11-24 02:11:38 +00:00
王怡栋 8d07eccfd5 Merge branch 'sprint/fixbug_liumengyi_30161' into 'master'
* Fix bug #30161.

See merge request easycorp/zentaopms!6343
2022-11-24 02:11:11 +00:00
tanghucheng 60e8bec22f * Fix feedback #1530. 2022-11-24 10:10:31 +08:00
xieqiyu ef70a4c142 * Fix bug#30188. 2022-11-24 09:57:35 +08:00
daitingting a3cc874acc * Fix bug #30174. 2022-11-24 01:55:13 +00:00
xieqiyu afb647bedf * Fix bug#30187. 2022-11-24 09:31:24 +08:00
wangyuting 32589ea897 * Fix bug #30132. 2022-11-24 01:14:35 +00:00
caoyanyi afc367f70e * Modify html style. 2022-11-24 09:09:17 +08:00
liumengyi 8ae0687af8 * Fix bug #30161. 2022-11-24 09:05:17 +08:00
wangyuting 38fc1d6599 * Fix bug #30138. 2022-11-24 00:50:40 +00:00
王怡栋 307629f078 * change nodeletereleased param to withreleased. 2022-11-23 17:23:02 +08:00
王怡栋 cb00dd2f6e Merge branch 'sprint/konglingmao_feedback1514' into 'master'
+ Resolved feedback #1514, notice error when project required.

See merge request easycorp/zentaopms!6341
2022-11-23 09:20:17 +00:00