Commit Graph
40540 Commits
Author SHA1 Message Date
孙广明 bb337fdc9c Merge branch 'fixbug_php' into 'master'
fixbug_php

See merge request easycorp/zentaopms!3990
2022-06-16 09:14:22 +00:00
sunjun 67dbc57ea8 fixbug_php 2022-06-16 09:13:03 +00: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
xieqiyu e0a9d3b339 * Fix bug#23762. 2022-06-16 16:56:57 +08: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
孙广明 e0764d4248 Merge branch 'fixbug_sunjun_23810' into 'master'
Fixbug sunjun 23810

See merge request easycorp/zentaopms!3977
2022-06-16 06:36:10 +00:00
sunjun 977a81d359 fixbug_sunjun_23810 2022-06-16 06:31:49 +00:00
孙广明 a0a5a6e9cb Merge branch 'sprint/204_liumengyi_678' into 'master'
* Fix issue #678.

See merge request easycorp/zentaopms!3975
2022-06-16 06:22:22 +00:00
liumengyi e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00
王怡栋 85890a4b13 Merge branch 'sprint/204_tianshujie_fixbug' into 'master'
Sprint/204 tianshujie fixbug

See merge request easycorp/zentaopms!3973
2022-06-16 06:00:49 +00:00
王怡栋 adb2f62df6 Merge branch 'sprint/master_zhouxudong_23787' into 'master'
* Fix bug #23787.

See merge request easycorp/zentaopms!3962
2022-06-16 05:59:06 +00:00
zhouxudong b7764e1518 * Fix bug #23787. 2022-06-16 05:55:43 +00:00
xieqiyu d246bca164 * Fix bug#23655. 2022-06-16 13:49:47 +08:00
sunjun 7dfc3f64a2 fixbug_sunjun_23810 2022-06-16 05:49:32 +00:00
tanghucheng ab9657abf9 * Fix bug #23832. 2022-06-16 13:49:10 +08:00
xieqiyu e33c963505 * Fix bug#23829. 2022-06-16 13:33:23 +08:00
tianshujie b1f29eed4e * Fix bug #23815. 2022-06-16 13:30:59 +08:00
tianshujie d351c15090 * Fix bug #23828. 2022-06-16 13:23:57 +08:00
孙广明 bfa7047dff Merge branch 'sgm_fixbug' into 'master'
Sgm fixbug

See merge request easycorp/zentaopms!3970
2022-06-16 05:17:36 +00:00
sunjun e2e1bddf96 fixbug_23694 2022-06-16 05:17:24 +00:00
孙广明 ef6f5e0eec * Code for testcase view page display bug style. 2022-06-16 13:15:57 +08:00