Commit Graph

40228 Commits

Author SHA1 Message Date
zhouxudong
d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00: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
王怡栋
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
sunjun
c8bf2f2e67 fixbug_sunjun_23572 2022-06-13 00:17:47 +00:00
liumengyi
a48a3614aa * Fix bug #23581. 2022-06-13 08:08:30 +08:00
lanzongjun
7c6b288878 * recover user 2022-06-10 17:26:57 +08:00
mayue
d3018dd978 * Optimize code. 2022-06-10 17:25:14 +08:00
王怡栋
9e5d6edaf8 Merge branch 'sprint/201_tianshujie_issue' into 'master'
* Resolve issue #674.

See merge request easycorp/zentaopms!3867
2022-06-10 08:25:31 +00:00
tianshujie
505a843518 Resolve issue #674. 2022-06-10 16:24:45 +08:00
王怡栋
feb533a008 Merge branch 'fixbug' into 'master'
* Fix bug expiring Plugins.

See merge request easycorp/zentaopms!3870
2022-06-10 08:23:18 +00:00
mayue
d72eda83d9 * Optimize code. 2022-06-10 16:20:40 +08:00
tianshujie
e5fd340b73 * Resolve issue #674. 2022-06-10 16:19:23 +08:00
mayue
9b76036761 * Optimize code. 2022-06-10 16:17:58 +08:00
李玉春
578252713b Merge branch '201_zhouxin_issues' into 'master'
* Fix issue.

See merge request easycorp/zentaopms!3869
2022-06-10 08:14:03 +00:00
zhouxin
619e31e6f9 * Fix issue. 2022-06-10 08:10:41 +00:00
mayue
bf56790216 * Fix bug #22928. 2022-06-10 16:06:10 +08:00
tianshujie
5dff5c5eb4 * Resolve issue #674. 2022-06-10 16:01:51 +08:00
孙广明
49f25c80e5 Merge branch 'sprint200_leiyong_adjust_style' into 'master'
* Adjust style.

See merge request easycorp/zentaopms!3864
2022-06-10 07:57:20 +00:00
孙广明
7f9e775486 Merge branch '201_zhouxin_bugs' into 'master'
* Fix bug #56479.

See merge request easycorp/zentaopms!3866
2022-06-10 07:55:11 +00:00
zhouxin
8a588426fd * Fix bug #56479. 2022-06-10 07:53:00 +00:00
孙广明
54bb4ccdcc Merge branch 'sprint/201_tianshujie_fixbug' into 'master'
* Fix bug #23573.

See merge request easycorp/zentaopms!3865
2022-06-10 07:17:05 +00:00
tianshujie
9162162212 * Fix bug #23573. 2022-06-10 15:14:43 +08:00
leiyong
4ffde5d6dc * Adjust style. 2022-06-10 06:56:42 +00:00
sunjun
a69d10d9db sprint_194 add project in batchcreate view 2022-06-10 06:36:12 +00:00
孙广明
d282416028 Merge branch 'fixbug_requirement' into 'master'
fixbug_requirement

See merge request easycorp/zentaopms!3863
2022-06-10 06:18:18 +00:00
sunjun
41c6a655a2 fixbug_requirement 2022-06-10 05:24:15 +00:00
王怡栋
e87eb29642 Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.

See merge request easycorp/zentaopms!3855
2022-06-10 05:06:30 +00:00
王怡栋
4a125c68ab Merge branch 'sprint/master_zhouxudong_56648' into 'master'
* Finish task #56648.

See merge request easycorp/zentaopms!3861
2022-06-10 05:02:03 +00:00
王怡栋
3b6b41e276 Merge branch 'sprint/master_zhouxudong_23510' into 'master'
* Fix bug #23510.

See merge request easycorp/zentaopms!3862
2022-06-10 05:01:37 +00:00
zhouxudong
291b9a6606 * Fix bug #23510. 2022-06-10 04:59:12 +00:00
孙广明
4106203a4b Merge branch 'sprint_sunjun_201' into 'master'
sprint_sunjun_201

See merge request easycorp/zentaopms!3860
2022-06-10 04:32:37 +00:00
孙广明
23ae4cea1c Merge branch 'master_xieqiyu_56376' into 'master'
* Finish task#56376.

See merge request easycorp/zentaopms!3859
2022-06-10 04:29:59 +00:00
sunjun
e21aff2d5d sprint_sunjun_201 2022-06-10 04:29:30 +00:00
xieqiyu
3e4fd3aa0f * Finish task#56376. 2022-06-10 12:01:27 +08:00
孙广明
32aaa90fd0 Merge branch 'sprint/201_liumengyi_23561' into 'master'
* Fix bug #23561.

See merge request easycorp/zentaopms!3858
2022-06-10 03:55:11 +00:00
liumengyi
311b1d251e * Fix bug #23561. 2022-06-10 11:45:07 +08:00
liumengyi
aa777c65d3 * Fix bug #23561. 2022-06-10 11:42:02 +08:00