Commit Graph
4873 Commits
Author SHA1 Message Date
Yagami 6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
lanzongjun 9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
daitingting a2aa5c325a * Fix bug #30020. 2022-11-25 07:36:53 +00:00
Yagami 76b3882e55 * Fix project manage products bug. 2022-11-25 14:10:07 +08:00
Yagami eda6dc67ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 13:10:25 +08:00
Yagami 4f16057c77 * Code for manage products. 2022-11-25 13:10:10 +08:00
王怡栋 e90baa91f9 Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.

See merge request easycorp/zentaopms!6381
2022-11-25 05:02:58 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
孙广明 1d9b2ce11c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245

See merge request easycorp/zentaopms!6376
2022-11-25 03:09:48 +00:00
孙广明 7f1533ed40 Merge branch 'master_xieqiyu_30233' into 'master'
* Fix bug#30233.

See merge request easycorp/zentaopms!6377
2022-11-25 03:09:25 +00:00
Yagami 84dce924b8 * Code for task #30261. 2022-11-25 11:07:45 +08:00
Yagami 7fbcb9b13e * Finish task #30261. 2022-11-25 10:50:22 +08:00
Yagami efbbaa9918 * Fix bug. 2022-11-25 09:53:17 +08:00
lanzongjun 3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
xieqiyu d00e4f5978 * Fix bug#30233. 2022-11-25 09:06:19 +08:00
Yagami 25e5b27220 * Finish task #77365. 2022-11-25 08:39:24 +08:00
王怡栋 6114d5cfbe Merge branch 'zentaopms_263_bug#30216' into 'master'
* Fix bug #30216.

See merge request easycorp/zentaopms!6372
2022-11-24 07:57:14 +00:00
wangyuting 22f2299bfa * Fix bug #30216. 2022-11-24 07:42:49 +00:00
王怡栋 8b19070f9b Merge branch 'tanghucheng_fixbug' into 'master'
* Adjust code for bug #30011,24060.

See merge request easycorp/zentaopms!6369
2022-11-24 07:40:07 +00:00
tanghucheng 3ca705de9f * Adjust code for bug #30011,24060. 2022-11-24 14:58:59 +08:00
xieqiyu 4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +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
daitingting 07f1d12ef8 * Fix bug #30185. 2022-11-24 03:03:42 +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
lanzongjun eac16b903f * Fix Bug #30156 2022-11-23 16:54:49 +08:00
孙广明 e2571ee150 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30157

See merge request easycorp/zentaopms!6335
2022-11-23 08:01:46 +00:00
lanzongjun 40ee11ba30 * Fix Bug #30157 2022-11-23 15:59:21 +08:00
Yagami 307e9c5f62 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-23 13:44:25 +08:00
王怡栋 3dd409514c Merge branch 'zentaopms_263_wangyuting2' into 'master'
* Optimize project build css.

See merge request easycorp/zentaopms!6315
2022-11-23 05:43:50 +00:00
Yagami 49581d7ece * Finish task #77252. 2022-11-23 13:43:06 +08:00
wangyuting 9b3e52ac3b * Optimize project build css. 2022-11-23 02:02:13 +00:00
wangyuting 63a249eeca * Fix bug #30045. 2022-11-23 01:29:34 +00:00
王怡栋 c8abe9f23a Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.

See merge request easycorp/zentaopms!6297
2022-11-22 06:39:17 +00:00
Yagami e4a80e800d * Finish task #76953. 2022-11-22 14:27:38 +08:00
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
Yagami 02580a0465 * Cannot remove product link when story in execution. 2022-11-22 11:17:40 +08:00
孙广明 70eb171c39 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #76951

See merge request easycorp/zentaopms!6287
2022-11-22 02:04:54 +00:00
lanzongjun 0a5cd963cf * Fix Task #76951 2022-11-22 08:50:39 +08: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
Yagami 07b30d1f7c * Finish task #76953. 2022-11-21 14:22:42 +08:00
王怡栋 7a47096356 * fix bug #30007. 2022-11-21 14:10:53 +08:00
lanzongjun 968ba89c77 * Fix bug #30034 2022-11-21 14:09:30 +08:00
王怡栋 2fb3ed6fd9 Merge branch 'zentaopms_263_bug_subprogram' into 'master'
* Display all products of the top program.

See merge request easycorp/zentaopms!6265
2022-11-21 05:26:07 +00:00
王怡栋 d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
daitingting 84b1383820 * Display all products of the top program. 2022-11-21 02:12:42 +00:00
xieqiyu bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00