Commit Graph
48482 Commits
Author SHA1 Message Date
xieqiyu 6aafddee29 * Fix bug of change branch at edit plan page. 2022-11-30 14:44:28 +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
daitingting a2aa5c325a * Fix bug #30020. 2022-11-25 07:36:53 +00:00
孙广明 33f1b35873 Merge branch 'master_xieqiyu_code' into 'master'
* Delete unused code.

See merge request easycorp/zentaopms!6384
2022-11-25 07:14:56 +00:00
王怡栋 647547faac * fix for upgrade. 2022-11-25 15:13:23 +08:00
xieqiyu 79a9c38403 * Delete unused code. 2022-11-25 15:11:54 +08:00
Yagami 83a76c2636 * Fix execution list bug. 2022-11-25 14:47:13 +08:00
Yagami 545b81abe7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 14:10:22 +08:00
Yagami 76b3882e55 * Fix project manage products bug. 2022-11-25 14:10:07 +08:00
王怡栋 808930a6b1 Merge branch 'zentaopms_263_fix_review' into 'master'
Zentaopms 263 fix review

See merge request easycorp/zentaopms!6383
2022-11-25 06:00:09 +00:00
王怡栋 67a0be29e7 * fix bug. 2022-11-25 13:59:22 +08:00
daitingting c366e94749 * Remove debugging codes. 2022-11-25 05:52:42 +00:00
daitingting 8650982994 * Fix issues of function review. 2022-11-25 05:50:02 +00:00
王怡栋 c9bcde900d * fix bug for link multiple builds. 2022-11-25 13:42:42 +08:00
王怡栋 c9c16d1a34 * fix for release product lang. 2022-11-25 13:34:40 +08:00
孙广明 c40b00d760 Merge branch 'master_xieqiyu_30186' into 'master'
* Fix bug#30186.

See merge request easycorp/zentaopms!6382
2022-11-25 05:24:38 +00:00
xieqiyu e5dcaf9f33 * Delete empty line. 2022-11-25 13:23:06 +08:00
xieqiyu 03705737f7 * Fix bug#30186. 2022-11-25 13:20: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
朱金勇 edcf2491cf Merge branch 'fix/path' into 'master'
* Optimize index and checktable file.

See merge request easycorp/zentaopms!6379
2022-11-25 04:12:57 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
王怡栋 1391d6b213 Merge branch 'zentaopms_263_bug#30132' into 'master'
* Adjust history data.

See merge request easycorp/zentaopms!6380
2022-11-25 03:10:45 +00:00