Commit Graph
40556 Commits
Author SHA1 Message Date
leiyong ae55e2c31e * Fix bug#23841. 2022-06-17 01:30:09 +00:00
孙广明 1bc6b260a5 Merge branch 'liyuchun_api' into 'master'
Remove unused code.

See merge request easycorp/zentaopms!3988
2022-06-17 00:35:37 +00:00
王怡栋 85339e8d1e Merge branch 'sprint202_leiyong_fix_bug_23821' into 'master'
* Fix bug#23821.

See merge request easycorp/zentaopms!3995
2022-06-17 00:33:53 +00:00
王怡栋 b6ec24a3d3 Merge branch 'sprint/hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!3994
2022-06-17 00:26:06 +00:00
leiyong 80c03beea7 * Fix bug#23821. 2022-06-16 11:16:17 +00:00
hufangzhou 64a0dab834 * Add the new version. 2022-06-16 18:04:47 +08:00
孙广明 3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
孙广明 8002199638 Merge branch 'sprint/tianshujie' into 'master'
* Delete useless code.

See merge request easycorp/zentaopms!3993
2022-06-16 09:24:01 +00:00
tianshujie fa117ec408 * Delete useless code. 2022-06-16 17:23:34 +08:00
tianshujie fc2aea0aa9 * Delete useless code. 2022-06-16 17:21:50 +08:00
孙广明 45cb7876dc Merge branch 'sprint/tianshujie' into 'master'
* If the project linked with the product belongs to the changed program, the...

See merge request easycorp/zentaopms!3991
2022-06-16 09:19:18 +00:00
孙广明 bb337fdc9c Merge branch 'fixbug_php' into 'master'
fixbug_php

See merge request easycorp/zentaopms!3990
2022-06-16 09:14:22 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
sunjun 67dbc57ea8 fixbug_php 2022-06-16 09:13:03 +00:00
tianshujie 9f21391681 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-16 17:11:07 +08:00
tianshujie 5bcad0bd62 * If the project linked with the product belongs to the changed program, the unmodifiable information will not be prompted. 2022-06-16 17:09:30 +08:00
sunjun fa3a7a318c fixbug_php 2022-06-16 09:04:42 +00:00
王怡栋 bd1dc044d1 Merge branch 'master_xieqiyu_23829' into 'master'
* Fix bug#23829.

See merge request easycorp/zentaopms!3972
2022-06-16 09:03:35 +00:00
王怡栋 af2b0ef327 Merge branch 'master_xieqiyu_23762' into 'master'
* Fix bug#23762.

See merge request easycorp/zentaopms!3989
2022-06-16 09:03:19 +00:00
王怡栋 4bf221548e Merge branch 'master_xieqiyu_23797' into 'master'
* Fix bug#23797.

See merge request easycorp/zentaopms!3981
2022-06-16 09:02:23 +00:00
王怡栋 119eaddc9d Merge branch 'master_xieqiyu_23655' into 'master'
* Fix bug#23655.

See merge request easycorp/zentaopms!3974
2022-06-16 09:01:15 +00:00
王怡栋 8eb32c3062 Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23832.

See merge request easycorp/zentaopms!3979
2022-06-16 08:59:06 +00:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
xieqiyu e0a9d3b339 * Fix bug#23762. 2022-06-16 16:56:57 +08:00
liyuchun 13b26f2119 * Add param when exec pipeline. 2022-06-16 08:55:46 +00:00
孙广明 1ca935f2b4 Merge branch 'sgm_fixbug' into 'master'
* Change product browse order btn.

See merge request easycorp/zentaopms!3987
2022-06-16 08:53:44 +00:00
孙广明 5af03f4cf6 * Change product browse order btn. 2022-06-16 16:52:08 +08:00
王怡栋 1f136f2e90 Merge branch 'sgm_fixbug' into 'master'
* Add upgrade sql.

See merge request easycorp/zentaopms!3986
2022-06-16 08:50:12 +00:00
孙广明 bae7786801 * Add upgrade sql. 2022-06-16 16:47:47 +08:00
孙广明 3c35bd84ea Merge branch 'sprint/201_tianshujie_23855' into 'master'
* Fix bug #23855.

See merge request easycorp/zentaopms!3980
2022-06-16 08:37:23 +00:00
孙广明 8668cd9fd1 Merge branch 'sprint/203_mayue_bug#23183' into 'master'
* Fix bug #23183.

See merge request easycorp/zentaopms!3984
2022-06-16 08:35:39 +00:00
mayue 88c7c0222b * Optimize code. 2022-06-16 16:34:13 +08:00
孙广明 42370ae0c5 Merge branch 'sprint/203_mayue_bug#23682' into 'master'
* Fix bug #23682.

See merge request easycorp/zentaopms!3985
2022-06-16 08:33:41 +00:00
tianshujie c51a1ac5f8 * Fix bug #23855. 2022-06-16 16:33:04 +08:00
tianshujie b438c9882a * Fix bug #23855. 2022-06-16 16:31:01 +08:00
mayue 9fd71c342b * Fix bug #23682. 2022-06-16 16:30:54 +08:00
wangyidong d5bdb62738 * fix bug #23814. 2022-06-16 16:19:03 +08:00
mayue 179191fd7d * Fix bug #23183. 2022-06-16 16:15:13 +08:00
朱金勇 03dfe512ef Merge branch 'liyuchun_api' into 'master'
* Finish task #57065.

See merge request easycorp/zentaopms!3982
2022-06-16 08:14:15 +00:00
tianshujie d9731bb06c * Fix bug #23855. 2022-06-16 16:12:37 +08:00
tianshujie 641c13383b * Fix bug #23855. 2022-06-16 16:06:55 +08:00
孙广明 dfb9cddc6a Merge branch 'fixissue_planIcon' into 'master'
fixissue_planIcon

See merge request easycorp/zentaopms!3983
2022-06-16 08:06:49 +00:00
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00
wangyidong 048c5e362e * adjust for project batchedit menu. 2022-06-16 15:51:06 +08:00
liyuchun 08b36c0418 * Finish task #57065. 2022-06-16 07:50:39 +00:00
xieqiyu 783d4471b0 * Fix bug#23797. 2022-06-16 15:50:25 +08:00
tianshujie 61d8ccda45 * Fix bug #23855. 2022-06-16 15:37:59 +08:00
孙广明 7383076af1 Merge branch 'sgm_fixbug' into 'master'
* Finsih task #57157.

See merge request easycorp/zentaopms!3978
2022-06-16 06:56:04 +00:00
孙广明 4ea6925479 * Finsih task #57157. 2022-06-16 14:51:22 +08:00
孙广明 3a1d6a8982 Merge branch 'fixbug_23694' into 'master'
fixbug_23694

See merge request easycorp/zentaopms!3971
2022-06-16 06:36:28 +00:00