Commit Graph
48504 Commits
Author SHA1 Message Date
xieqiyu d5b322bc05 * Code for task#77802. Add tips when branch empty at batch edit plan. 2022-12-01 10:41:27 +08:00
xieqiyu c109140c81 * Code for task#77802. Modify batch edit plan. 2022-12-01 10:06:33 +08:00
兰宗俊 73e8aa89e9 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* fix bug #30402

See merge request easycorp/zentaopms!6425
2022-12-01 01:45:49 +00:00
lanzongjun aff72c1c26 * fix bug #30402 2022-12-01 09:44:04 +08:00
孙广明 917e23dbcd Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256'
* Unlink bug when edit branch of plan.

See merge request easycorp/zentaopms!6424
2022-12-01 01:08:20 +00:00
mayue d16d7fcb08 * Unlink bug when edit branch of plan. 2022-12-01 09:06:16 +08:00
孙广明 9eb0117eae Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256'
* Finish task #77795.

See merge request easycorp/zentaopms!6420
2022-12-01 00:44:30 +00:00
孙广明 f44f500593 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
Sprint/zentaopms256 lanzongjun

See merge request easycorp/zentaopms!6423
2022-12-01 00:44:23 +00:00
孙广明 3e5731a93d Merge branch 'pms256_xieqiyu_77802' into 'zentaopms_256'
Pms256 xieqiyu 77802

See merge request easycorp/zentaopms!6422
2022-12-01 00:44:10 +00:00
lanzongjun 65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
xieqiyu c9bcbe74ae * Code for task#78030. 2022-11-30 22:29:51 +08:00
xieqiyu 7c51a7f992 * Code for task#77802. 2022-11-30 22:18:27 +08:00
mayue fe91c3e210 * Finish task #77795. 2022-11-30 17:22:39 +08:00
兰宗俊 9952631059 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* Finish Task #77806

See merge request easycorp/zentaopms!6418
2022-11-30 08:00:42 +00:00
lanzongjun d704662eca Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 15:58:15 +08:00
lanzongjun 2a75393953 * Finish Task #77806 2022-11-30 15:57:08 +08:00
兰宗俊 f9819edbbe Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* Finish Task #77799#77806

See merge request easycorp/zentaopms!6415
2022-11-30 07:49:08 +00:00
lanzongjun f90d78b40e Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 15:19:30 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
xieqiyu 6aafddee29 * Fix bug of change branch at edit plan page. 2022-11-30 14:44:28 +08:00
lanzongjun 9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun 2ea882a99a Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 13:19:07 +08:00
lanzongjun ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
孙广明 529a0d3828 Merge branch 'pms256_xieqiyu_77794' into 'zentaopms_256'
Pms256 xieqiyu 77794

See merge request easycorp/zentaopms!6411
2022-11-30 02:46:30 +00:00
xieqiyu 86baf6e608 * Code for task#77794. Modify the page of plan view. 2022-11-30 10:10:22 +08:00
xieqiyu 86577288b2 * Code for task#77794. Modify sql. 2022-11-30 09:50:37 +08:00
xieqiyu 2a92cee55e * Code for task#77794. Batch edit productplan. 2022-11-30 09:45:37 +08:00
xieqiyu 5095e566d8 * Code for task#77794. Edit productplan. 2022-11-30 09:30:44 +08:00
孙广明 f2e618cfa9 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* Finish Task #77798#77796

See merge request easycorp/zentaopms!6403
2022-11-30 01:20:50 +00:00
lanzongjun 7e0f9114c0 code meeting fix 2022-11-30 09:17:05 +08:00
lanzongjun 00877a531d code meeting fix 2022-11-30 09:05:23 +08:00
lanzongjun d671be8b02 project link plan tips 2022-11-29 16:22:24 +08:00
孙广明 da1036ba48 Merge branch 'sprint/zentaopms268_mayue_task#77805' into 'zentaopms_256'
* Finish task #77805.

See merge request easycorp/zentaopms!6404
2022-11-29 08:18:04 +00:00
mayue 3636439554 * Finish task #77805. 2022-11-29 16:15:22 +08:00
lanzongjun cab0ed4caf project edit plan modify 2022-11-29 15:50:31 +08:00
xieqiyu 996cc54961 * Code for task#77794. 2022-11-29 15:04:38 +08:00
xieqiyu 2c6e7ffa39 * Code for task#77794. 2022-11-29 15:03:58 +08:00
lanzongjun 9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
Yagami 5888ca9b97 * Code for task #77807. 2022-11-29 09:25:08 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
孙广明 f4286ebdc0 Merge branch 'master_xieqiyu_30277' into 'master'
* Fix bug#30277.

See merge request easycorp/zentaopms!6387
zentaopms_18.0.beta1
2022-11-25 09:55:24 +00:00
胡方舟 13448090a3 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6388
2022-11-25 09:52:30 +00:00
wangyuting 88f5f0dd3b * Fix bug. 2022-11-25 09:47:27 +00:00
xieqiyu 679fe9d5f2 * Fix bug#30277. 2022-11-25 16:24:54 +08:00
王怡栋 3707c77b53 Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30282.

See merge request easycorp/zentaopms!6386
2022-11-25 08:14:24 +00:00
tanghucheng 8f20075c51 * Fix bug #30282. 2022-11-25 16:12:51 +08:00
王怡栋 c4b3e8d18a * code for bug #devops. 2022-11-25 15:57:52 +08:00
王怡栋 46d98dcada Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 15:56:16 +08:00
王怡栋 a14dc11193 * fix bug #30271. 2022-11-25 15:55:07 +08:00
王怡栋 593c7d41b2 Merge branch 'zentaopms_263_bug_#30020' into 'master'
* Fix bug #30020.

See merge request easycorp/zentaopms!6385
2022-11-25 07:40:55 +00:00