 王怡栋
|
5cd347ce80
|
Merge branch 'sprint/daitingting_fix_story_assign' into 'master'
* Remove comment field of story.
See merge request easycorp/zentaopms!3324
|
2022-05-11 05:29:14 +00:00 |
|
|
daitingting
|
3315ef0f49
|
* Remove comment field of story.
|
2022-05-11 05:25:54 +00:00 |
|
|
王怡栋
|
82968630b0
|
Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671
See merge request easycorp/zentaopms!3322
|
2022-05-11 05:17:05 +00:00 |
|
|
孙广明
|
da6ab52f7b
|
Merge branch 'sprint/189_zhouxin_53658' into 'master'
Sprint/189 zhouxin 53658
See merge request easycorp/zentaopms!3321
|
2022-05-11 05:13:18 +00:00 |
|
|
wangyidong
|
828fddb8b7
|
* code for task #53589.
|
2022-05-11 13:02:08 +08:00 |
|
|
xieqiyu
|
5c23f91a05
|
* Code for task#53671.
|
2022-05-11 11:29:03 +08:00 |
|
|
王怡栋
|
f98d33e010
|
Merge branch 'sprint/189_hufangzhou_53673' into 'master'
* Finish task #53673.
See merge request easycorp/zentaopms!3316
|
2022-05-11 03:27:53 +00:00 |
|
|
wangyidong
|
703ef6e4eb
|
Merge branch 'fixbug'
|
2022-05-11 11:26:21 +08:00 |
|
|
王怡栋
|
72584ceb38
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-11 03:26:01 +00:00 |
|
|
zhouxin
|
c78ab4be77
|
* Adjust code.
|
2022-05-11 03:24:49 +00:00 |
|
|
王怡栋
|
1a90f16fd0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix task #53588
See merge request easycorp/zentaopms!3320
|
2022-05-11 03:17:29 +00:00 |
|
|
tanghucheng
|
f3f0dd5647
|
* Code for task #53591.
|
2022-05-11 03:16:41 +00:00 |
|
|
zhouxin
|
c6ac480351
|
* Fix bug.
|
2022-05-11 03:05:13 +00:00 |
|
|
lanzongjun
|
2f060c927b
|
* fix task #53588
|
2022-05-11 11:00:19 +08:00 |
|
|
lanzongjun
|
fc36941647
|
* fix task #53588
|
2022-05-11 10:58:57 +08:00 |
|
|
李玉春
|
2aeee3f5f4
|
Merge branch 'sprint/189_liumengyi_53647' into 'master'
* Fix bug for #task 53647.
See merge request easycorp/zentaopms!3319
|
2022-05-11 02:47:29 +00:00 |
|
|
liumengyi
|
460f597c60
|
* Fix bug for #task 53647.
|
2022-05-11 10:46:40 +08:00 |
|
|
xieqiyu
|
f821b92e7f
|
* Modify review code.
|
2022-05-11 10:44:00 +08:00 |
|
|
zhouxin
|
fe6b01a440
|
* Adjust code.
|
2022-05-11 02:41:05 +00:00 |
|
|
李玉春
|
22cafe2e02
|
Merge branch 'sprint/189_liumengyi_53647' into 'master'
* Finish task #53647.
See merge request easycorp/zentaopms!3318
|
2022-05-11 02:40:46 +00:00 |
|
|
zhouxin
|
51ec6494a0
|
* Add comment.
|
2022-05-11 02:19:09 +00:00 |
|
|
hufangzhou
|
3680af6833
|
* Finish task #53673.
|
2022-05-11 10:05:09 +08:00 |
|
|
liumengyi
|
8c6c09d699
|
* Finish task #53647.
|
2022-05-11 10:02:02 +08:00 |
|
|
zhouxin
|
b015ea5c77
|
* Finish task #53658.
|
2022-05-11 01:53:10 +00:00 |
|
|
王怡栋
|
61c086d94f
|
Merge branch 'sprint/daitingting_buildoperatemenu_productplan' into 'master'
* Build operate menu for productplan module.
See merge request easycorp/zentaopms!3315
|
2022-05-11 01:51:59 +00:00 |
|
|
liumengyi
|
977e100d04
|
* Finish task #53647.
|
2022-05-11 09:48:08 +08:00 |
|
|
daitingting
|
8243e4c175
|
* Remove empty line.
|
2022-05-11 01:47:55 +00:00 |
|
|
daitingting
|
09514cf770
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/daitingting_buildoperatemenu_productplan
|
2022-05-11 01:47:04 +00:00 |
|
|
daitingting
|
0fba3427af
|
* Build operate menu for productplan module.
|
2022-05-11 01:39:53 +00:00 |
|
|
xieqiyu
|
c77a6505d3
|
* Finish task#53671.
|
2022-05-11 09:01:17 +08:00 |
|
|
朱金勇
|
c60e32238c
|
Merge branch 'ci' into 'master'
Add gitlab-ci and sonar properties files for ci
See merge request easycorp/zentaopms!3307
|
2022-05-10 13:16:33 +00:00 |
|
|
孙广明
|
ec014a85f0
|
Merge branch 'sprint/189_zhouxudong_53670' into 'master'
* Finish task #53670.
See merge request easycorp/zentaopms!3314
|
2022-05-10 09:24:53 +00:00 |
|
|
孙广明
|
887657308a
|
Merge branch 'sprint/189_liumengyi_53663' into 'master'
* Finish task #53663.
See merge request easycorp/zentaopms!3311
|
2022-05-10 09:23:24 +00:00 |
|
|
liumengyi
|
b4eda681c6
|
* Code for task #53663.
|
2022-05-10 17:22:29 +08:00 |
|
|
liumengyi
|
92f20d0914
|
* Finish task #53663, code format.
|
2022-05-10 17:19:48 +08:00 |
|
|
wangyidong
|
d09a097714
|
Merge branch 'fixbug'
|
2022-05-10 17:12:18 +08:00 |
|
|
王怡栋
|
561b0bdbf1
|
Merge branch 'master' into 'fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-10 09:12:01 +00:00 |
|
|
孙广明
|
e6ba9acf68
|
Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668
See merge request easycorp/zentaopms!3310
|
2022-05-10 09:09:34 +00:00 |
|
|
tianshujie
|
5bdb7f521c
|
* Finish task #53668.
|
2022-05-10 17:05:49 +08:00 |
|
|
wangyidong
|
7ad3f1cb56
|
Merge branch 'sprint/master_lanzongjun_fixbug'
|
2022-05-10 17:05:46 +08:00 |
|
|
王怡栋
|
e96bea3c6c
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# db/update16.5.sql
|
2022-05-10 09:05:19 +00:00 |
|
|
lanzongjun
|
f4c8db7ed8
|
* fix task #53591
|
2022-05-10 17:02:03 +08:00 |
|
|
tanghucheng
|
9712ddcea9
|
Merge branch 'fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug
|
2022-05-10 08:54:22 +00:00 |
|
|
tanghucheng
|
bd06901bfa
|
* Fix bug.
|
2022-05-10 08:52:05 +00:00 |
|
|
wangyidong
|
58bdb3144c
|
Merge branch 'sprint/wangyuting_workflow'
|
2022-05-10 16:47:05 +08:00 |
|
|
王怡栋
|
d9d331c38e
|
Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
# framework/control.class.php
|
2022-05-10 08:46:32 +00:00 |
|
|
wangyuting2
|
bcf64c0c54
|
* Optimize code.
|
2022-05-10 16:41:36 +08:00 |
|
|
wangyuting2
|
248683c67d
|
* Merge code.
|
2022-05-10 16:36:06 +08:00 |
|
|
wangyuting2
|
fe3c882c5e
|
* Adjust buildin workflow menu.
|
2022-05-10 16:32:04 +08:00 |
|
|
liumengyi
|
987edcc3cf
|
* Finish task #53663.
|
2022-05-10 16:29:56 +08:00 |
|