 sunjun
|
c8bf2f2e67
|
fixbug_sunjun_23572
|
2022-06-13 00:17:47 +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 |
|
|
孙广明
|
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 |
|
|
王怡栋
|
5917d86f0d
|
Merge branch 'sprint/201_liumengyi_23423' into 'master'
* Fix bug #23423.
See merge request easycorp/zentaopms!3854
|
2022-06-10 03:11:13 +00:00 |
|
|
liumengyi
|
c6eb7aaff0
|
* Fix bug #23423.
|
2022-06-10 11:08:43 +08:00 |
|
|
zhouxudong
|
8f8eaaa837
|
* Finish task #56368.
|
2022-06-10 03:08:22 +00:00 |
|
|
李玉春
|
15812a5cb1
|
Merge branch '201_zhouxin_56467' into 'master'
201 zhouxin 56467
See merge request easycorp/zentaopms!3853
|
2022-06-10 02:53:00 +00:00 |
|
|
zhouxin
|
555ca3c450
|
* Adjust code.
|
2022-06-10 02:50:27 +00:00 |
|
|
zhouxin
|
d1e3ba6c5e
|
* Adjust code.
|
2022-06-10 02:46:45 +00:00 |
|
|
zhouxin
|
b167243b48
|
* Finish task #56467.
|
2022-06-10 02:31:24 +00:00 |
|
|
孙广明
|
2363290d9a
|
Merge branch '199_mayue_task56550,56553' into 'master'
* Ajust mutual test issue.
See merge request easycorp/zentaopms!3852
|
2022-06-10 02:31:18 +00:00 |
|
|
zhouxudong
|
51f5d5bd3a
|
* Finish task #56648.
|
2022-06-10 02:29:54 +00:00 |
|
|
mayue
|
e11b76d819
|
* Ajust mutual test issue.
|
2022-06-10 10:23:27 +08:00 |
|
|
孙广明
|
6d78419e2b
|
Merge branch 'sprint/201_liumengyi_23423' into 'master'
* Fix bug #23423.
See merge request easycorp/zentaopms!3851
|
2022-06-10 02:20:27 +00:00 |
|
|
liumengyi
|
0386e08d52
|
* Fix bug #23423.
|
2022-06-10 10:16:54 +08:00 |
|
|
王怡栋
|
2849f7a229
|
Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.
See merge request easycorp/zentaopms!3850
|
2022-06-10 02:07:33 +00:00 |
|
|
zhouxudong
|
de0d579bdd
|
* Finish task #56368.
|
2022-06-10 02:03:36 +00:00 |
|
|
王怡栋
|
097faf3c7d
|
Merge branch 'sprint/master_zhouxudong_56374' into 'master'
Sprint/master zhouxudong 56374
See merge request easycorp/zentaopms!3849
|
2022-06-10 02:01:58 +00:00 |
|
|
王怡栋
|
0f022766e3
|
Merge branch 'sgm_effortsql' into 'master'
* Finish task #56545.
See merge request easycorp/zentaopms!3848
|
2022-06-10 02:01:15 +00:00 |
|
|
王怡栋
|
74554fe0bb
|
Merge branch 'sprint200_leiyong_task_56370' into 'master'
Sprint200 leiyong task 56370
See merge request easycorp/zentaopms!3847
|
2022-06-10 01:51:28 +00:00 |
|
|
孙广明
|
212fb344c3
|
* Finish task #56545.
|
2022-06-10 09:44:48 +08:00 |
|
|
zhouxin
|
c7aa2f7fff
|
* Adjust code.
|
2022-06-10 01:43:10 +00:00 |
|
|
zhouxudong
|
82afc7ae76
|
* Finish task #56374.
|
2022-06-10 01:43:08 +00:00 |
|
|
zhouxin
|
b10daf5a01
|
* Adjust code.
|
2022-06-10 01:40:16 +00:00 |
|
|
leiyong
|
82caa7ee4d
|
* Fix bug#23542.
|
2022-06-10 01:36:47 +00:00 |
|
|
王怡栋
|
4eff0d7532
|
Merge branch 'sprint/201_tianshujie_fixbug' into 'master'
Sprint/201 tianshujie fixbug
See merge request easycorp/zentaopms!3846
|
2022-06-10 01:33:29 +00:00 |
|
|
zhouxudong
|
94c8b0a523
|
* Finish task #56374.
|
2022-06-10 01:32:52 +00:00 |
|
|
leiyong
|
3f03e8cb4a
|
* Finish task#56370.
|
2022-06-10 01:32:01 +00:00 |
|
|
tianshujie
|
01c135440b
|
* Fix bug #23455.
|
2022-06-10 09:31:44 +08:00 |
|
|
tianshujie
|
6825ac20c4
|
* Fix bug #23421.
|
2022-06-10 09:31:00 +08:00 |
|
|
tianshujie
|
baff0cf4fe
|
* Optimize code.
|
2022-06-10 09:23:12 +08:00 |
|
|
tianshujie
|
3f1dc22664
|
* Finish task #56469.
|
2022-06-10 09:22:50 +08:00 |
|
|
zhouxin
|
ee8af517fa
|
* Finish task #56467.
|
2022-06-10 01:22:12 +00:00 |
|
|
孙广明
|
4e40722b6d
|
Merge branch 'sprint/199_mayue_task56550,56553' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!3845
|
2022-06-10 01:08:31 +00:00 |
|
|
王怡栋
|
fad3f54c7b
|
Merge branch 'sprint/201_tianshujie_56460' into 'master'
* Finish task #56460.
See merge request easycorp/zentaopms!3844
|
2022-06-10 01:07:17 +00:00 |
|
|
wangyidong
|
08f2b93399
|
Merge branch 'sprint/201_tianshujie_56469'
|
2022-06-10 09:06:30 +08:00 |
|
|
王怡栋
|
a9981b0a33
|
Merge branch 'master' into 'sprint/201_tianshujie_56469'
# Conflicts:
# module/execution/control.php
# module/execution/js/kanban.js
# module/kanban/control.php
# module/kanban/model.php
|
2022-06-10 01:05:39 +00:00 |
|