Commit Graph
33189 Commits
Author SHA1 Message Date
zenggang cc49cbe439 * Finish task#57156 2022-06-14 06:03:55 +00:00
孙广明 0397a7b0b5 Merge branch 'sprint/203_mayue_bug#23410' into 'master'
* Fix bug #23410.

See merge request easycorp/zentaopms!3897
2022-06-14 05:35:39 +00:00
王怡栋 f5788a4535 Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098

See merge request easycorp/zentaopms!3900
2022-06-14 05:28:03 +00:00
tianshujie 3d9012cfca * Finish task #57098. 2022-06-14 13:18:52 +08:00
mayue a70fd10f87 * Fix bug #23410. 2022-06-14 11:17:25 +08:00
孙广明 da2b704d31 * Finish task #57157. 2022-06-14 10:46:29 +08:00
孙广明 d9e036ba0c Merge branch 'sgm_56629' into 'master'
* Add en lang.

See merge request easycorp/zentaopms!3894
2022-06-14 02:26:04 +00:00
孙广明 e287ded97e * Add en lang. 2022-06-14 10:25:33 +08:00
王怡栋 89506d91c6 Merge branch 'sgm_56629' into 'master'
* Finish task #56629.

See merge request easycorp/zentaopms!3893
2022-06-14 02:24:12 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
王怡栋 ae1bc3cfc1 Merge branch 'sprint/master_zhouxudong_23554' into 'master'
Sprint/master zhouxudong 23554

See merge request easycorp/zentaopms!3886
2022-06-14 02:00:12 +00:00
zhouxudong aedd5764a9 * Finish task #23554. 2022-06-14 01:58:37 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
王怡栋 4b8e8cd21e Merge branch 'master_xieqiyu_56936' into 'master'
* Finish task#56936.

See merge request easycorp/zentaopms!3887
2022-06-14 01:26:03 +00:00
王怡栋 a464cf61d2 Merge branch 'sgm_56635' into 'master'
Sgm 56635

See merge request easycorp/zentaopms!3884
2022-06-14 01:25:40 +00:00
王怡栋 24e35041ae Merge branch 'master_xieqiyu_56909' into 'master'
* Finish task#56909.

See merge request easycorp/zentaopms!3885
2022-06-14 01:25:05 +00:00
孙广明 f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
王怡栋 e6977466e6 Merge branch 'master_xieqiyu_56907' into 'master'
* Finish task#56907.

See merge request easycorp/zentaopms!3883
2022-06-14 01:20:37 +00:00
王怡栋 6a2e3d116f Merge branch 'sprint/master_zhouxudong_56908' into 'master'
Sprint/master zhouxudong 56908

See merge request easycorp/zentaopms!3890
2022-06-14 01:17:18 +00:00
王怡栋 0e042d43ba Merge branch 'sprint/master_zhouxudong_23427' into 'master'
Sprint/master zhouxudong 23427

See merge request easycorp/zentaopms!3881
2022-06-14 01:12:35 +00:00
liumengyi 39dabf6ff3 * Finish task #57099. 2022-06-13 16:02:23 +08:00
zhouxudong 483ecf2847 * Finish task #56908. 2022-06-13 08:01:10 +00:00
zhouxudong f6c4b3adb1 * Finish task #56908. 2022-06-13 07:59:29 +00:00
zhouxudong 9743e0031b * Finish task #56908. 2022-06-13 07:46:52 +00:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
xieqiyu ee6c3a53c0 * Finish task#56936. 2022-06-13 15:12:20 +08:00
zhouxudong 1dded0473e * Fix bug #23554. 2022-06-13 06:47:08 +00:00
xieqiyu caf596097a * Finish task#56909. 2022-06-13 14:45:36 +08:00
孙广明 7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
xieqiyu 771db77e9f * Finish task#56907. 2022-06-13 14:03:54 +08:00
朱金勇 6620381bc7 Merge branch 'sprint/scx_fixapibug' into 'master'
* Fix api bug.

See merge request easycorp/zentaopms!3871
2022-06-13 06:01:56 +00:00
zhouxudong 0ec97fbba4 * Finish task #56944 #56943 #56941 #56938. 2022-06-13 05:37:22 +00:00
xieqiyu c7919c48d0 * Fix bug#23597. 2022-06-13 13:17:25 +08:00
王怡栋 f85b6d05a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3877
2022-06-13 05:02:49 +00:00
zhouxudong 26a57e00cd * Fix bug #23543 #23434 #23427 #23419. 2022-06-13 04:24:33 +00:00
孙广明 753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
王怡栋 372c9de4fc Merge branch 'sgm_fixbug' into 'master'
* Code for bug #23508.

See merge request easycorp/zentaopms!3878
2022-06-13 02:28:51 +00:00
孙广明 f51b7998d5 * Code for bug #23508. 2022-06-13 10:21:28 +08:00
tianshujie 450ecef008 * Fix bug #23201. 2022-06-13 10:12:29 +08:00
王怡栋 6325ce1ccc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* recover user

See merge request easycorp/zentaopms!3872
2022-06-13 02:09:30 +00:00
王怡栋 c89ca73832 Merge branch 'sprint/fixbug_liumengyi_23581' into 'master'
* Fix bug #23581, and fix issue #673.

See merge request easycorp/zentaopms!3873
2022-06-13 02:08:33 +00:00
liumengyi cb8dc6954c * Optimize code for bug #23581. 2022-06-13 10:07:34 +08:00
孙广明 5c1f32c3d9 Merge branch 'sprint_194' into 'master'
sprint_194 add project in batchcreate view

See merge request easycorp/zentaopms!3876
2022-06-13 02:06:00 +00:00
sunjun 385e4b23e3 sprint_194 2022-06-13 02:05:02 +00:00
liumengyi 76b3f952a0 * Fix issue #673. 2022-06-13 10:02:33 +08:00
孙广明 5568901e92 Merge branch 'zhouxin_bugtotask' into 'master'
* Finish task #55258.

See merge request easycorp/zentaopms!3875
2022-06-13 01:45:35 +00:00
tianshujie 5ea628d394 * Fix bug #23368. 2022-06-13 09:45:32 +08:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
孙广明 a42ef81a50 Merge branch 'fixbug_sunjun_23572' into 'master'
fixbug_sunjun_23572

See merge request easycorp/zentaopms!3874
2022-06-13 00:54:52 +00:00
孙广明 3a75fa0ad8 Merge branch 'sprint/199_mayue_bug#22928' into 'master'
* Fix bug #22928.

See merge request easycorp/zentaopms!3868
2022-06-13 00:52:59 +00:00