 李玉春
|
bc643436ab
|
Merge branch 'sprint/fixbug_zxd_19424' into 'master'
Fix bug #19424.
See merge request easycorp/zentaopms!1776
|
2022-02-14 06:58:21 +00:00 |
|
|
李玉春
|
eeefcf84ab
|
Merge branch 'sunhuawei_fixbug_19425' into 'master'
Fix bug #19425.
See merge request easycorp/zentaopms!1786
|
2022-02-14 06:56:36 +00:00 |
|
|
孙华伟
|
aa3b14326c
|
Fix bug #19425.
|
2022-02-14 14:53:32 +08:00 |
|
|
李玉春
|
2a5b157a7f
|
Merge branch 'sprint/fixbug_zxd_19460' into 'master'
*Fux bug #19460 #19458.
See merge request easycorp/zentaopms!1784
|
2022-02-14 06:40:59 +00:00 |
|
|
孙华伟
|
b54a465321
|
Fix bug #19245.
|
2022-02-14 14:39:33 +08:00 |
|
|
孙华伟
|
8ae7893955
|
Fix bug #19425.
|
2022-02-14 14:38:19 +08:00 |
|
|
孙华伟
|
97923aace8
|
Fix bug #19425.
|
2022-02-14 14:36:00 +08:00 |
|
|
孙广明
|
d79fcb2a29
|
Merge branch 'sprint/184_hufangzhou_19506' into 'master'
* Fix bug #19506.
See merge request easycorp/zentaopms!1785
|
2022-02-14 06:01:03 +00:00 |
|
|
hufangzhou
|
64f8980289
|
* Fix bug #19506.
|
2022-02-14 13:57:52 +08:00 |
|
|
周旭东
|
3b88357aad
|
Update model.php
|
2022-02-14 05:22:36 +00:00 |
|
|
周旭东
|
a50c77de55
|
Update control.php
|
2022-02-14 05:20:41 +00:00 |
|
|
zhouxudong
|
a13a78f7bb
|
*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.*Fux bug #19460 #19458.
|
2022-02-14 13:17:45 +08:00 |
|
|
李玉春
|
e6db39683a
|
Merge branch 'devops21_zhangzilong_19319' into 'master'
# Fix bug #19319.
See merge request easycorp/zentaopms!1782
|
2022-02-14 03:28:55 +00:00 |
|
|
zhangzilong
|
3a545530a6
|
* Code for bug #19319.
|
2022-02-14 11:28:01 +08:00 |
|
|
zhangzilong
|
1195ff854b
|
* Fix bug #19319.
|
2022-02-14 11:20:41 +08:00 |
|
|
zhangzilong
|
127c3ff36a
|
* Code for bug #19319.
|
2022-02-14 11:16:23 +08:00 |
|
|
zhangzilong
|
bb828d54cf
|
* Code for bug #19319.
|
2022-02-14 11:13:24 +08:00 |
|
|
李玉春
|
b14ff591f6
|
Merge branch 'devops_cyy_bug' into 'master'
* Modify api get group param.
See merge request easycorp/zentaopms!1783
|
2022-02-14 03:04:46 +00:00 |
|
|
caoyanyi
|
e4429fbadb
|
* Modify api get group param.
|
2022-02-14 11:02:07 +08:00 |
|
|
王怡栋
|
ebb1e279ad
|
Merge branch 'sgm_jira' into 'master'
Sgm jira
See merge request easycorp/zentaopms!1780
|
2022-02-14 02:57:36 +00:00 |
|
|
zhangzilong
|
106447b401
|
* Fix bug #19319.
|
2022-02-14 10:56:50 +08:00 |
|
|
孙广明
|
62801e23d7
|
* Fix details.
|
2022-02-14 10:56:20 +08:00 |
|
|
孙广明
|
53894c8ae5
|
Merge branch 'sprint/184_hufangzhou_19471' into 'master'
* Fix bug #19471.
See merge request easycorp/zentaopms!1781
|
2022-02-14 02:55:03 +00:00 |
|
|
hufangzhou
|
82895b18d2
|
* Fix bug #19471.
|
2022-02-14 10:50:06 +08:00 |
|
|
孙广明
|
c2859341fd
|
* Fix jira bug.
|
2022-02-14 10:47:13 +08:00 |
|
|
zhangzilong
|
dcdfb0cdee
|
* Fix bug #19319.
|
2022-02-14 10:32:12 +08:00 |
|
|
liyuchun
|
5583b62fc9
|
Merge branch 'devops21'
|
2022-02-14 10:20:11 +08:00 |
|
|
王怡栋
|
d502f82c20
|
Merge branch 'devops21_liyuchun' into 'devops21'
* Fix error.
See merge request easycorp/zentaopms!1775
|
2022-02-14 02:16:11 +00:00 |
|
|
李玉春
|
519d488735
|
Merge branch 'devops21_sunhuawei_fixBug_19435' into 'devops21'
*Fix bug 19435.
See merge request easycorp/zentaopms!1777
|
2022-02-14 02:10:29 +00:00 |
|
|
孙华伟
|
db37a2ea85
|
Fix bug #19435.
|
2022-02-14 10:07:49 +08:00 |
|
|
liyuchun
|
95f25cc508
|
* Fix bug.
|
2022-02-14 10:06:34 +08:00 |
|
|
李玉春
|
3200e137f4
|
Merge branch 'devops21_zenggang' into 'devops21'
修复bug19440
See merge request easycorp/zentaopms!1778
|
2022-02-14 02:04:26 +00:00 |
|
|
zenggang
|
1473f7161f
|
* Fix bug#19440
|
2022-02-14 01:46:28 +00:00 |
|
|
liyuchun
|
3bf560137a
|
* Add unit cases.
|
2022-02-14 09:38:15 +08:00 |
|
|
孙华伟
|
1a494d0329
|
Fix bug #19435.
|
2022-02-14 09:32:47 +08:00 |
|
|
zhouxudong
|
090905f628
|
Fix bug #19424.
|
2022-02-14 08:42:51 +08:00 |
|
|
liyuchun
|
26ec64058c
|
* Fix error.
|
2022-02-14 08:28:13 +08:00 |
|
|
李玉春
|
c856323c92
|
Merge branch 'sprint/task_zhouxudong_48844' into 'master'
*Finish task #48844.
See merge request easycorp/zentaopms!1773
|
2022-02-14 00:26:45 +00:00 |
|
|
周旭东
|
84b35d270b
|
Update control.php
|
2022-02-14 00:26:15 +00:00 |
|
|
李玉春
|
2edcbe0207
|
Merge branch 'devops21_zenggang' into 'devops21'
zg:Fix bug#19440,19441,19442
See merge request easycorp/zentaopms!1774
|
2022-02-14 00:22:39 +00:00 |
|
|
孙广明
|
7976059ddc
|
* Code for jira.
|
2022-02-12 16:06:28 +08:00 |
|
|
孙华伟
|
ef8e2c049b
|
*Fix bug 19435.
|
2022-02-11 17:39:30 +08:00 |
|
|
zenggang
|
afd2b95e74
|
* Fix bug#19440,19441,19442
|
2022-02-11 09:38:34 +00:00 |
|
|
zhouxudong
|
c3112657d2
|
*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.*Finish task #48844.
|
2022-02-11 17:33:22 +08:00 |
|
|
王怡栋
|
78bf6df425
|
Merge branch 'sgm_jira' into 'master'
Sgm jira
See merge request easycorp/zentaopms!1772
|
2022-02-11 09:17:05 +00:00 |
|
|
李玉春
|
4bf3353189
|
Merge branch 'devops21_zhangzilong_19255' into 'devops21'
* Fix bug #19255.
See merge request easycorp/zentaopms!1771
|
2022-02-11 09:10:40 +00:00 |
|
|
zhangzilong
|
b7f793a9eb
|
* Code for bug #19255.
|
2022-02-11 17:09:50 +08:00 |
|
|
zhangzilong
|
2b58859434
|
* Code for bug #19255.
|
2022-02-11 16:54:49 +08:00 |
|
|
zhangzilong
|
789a1292ac
|
* Fix bug #19255.
|
2022-02-11 16:49:32 +08:00 |
|
|
李玉春
|
224c8c668b
|
Merge branch 'devops_cyy_test' into 'devops21'
* Modify test case.
See merge request easycorp/zentaopms!1765
|
2022-02-11 08:38:20 +00:00 |
|