 hufangzhou
|
60e1885ccb
|
* Revert the code for BI nav.
|
2023-03-16 16:38:24 +08:00 |
|
|
王怡栋
|
c068ece5c8
|
Merge branch 'fixbug_tanghucheng' into 'master'
* Fix bug for export bug.
See merge request easycorp/zentaopms!7215
|
2023-03-16 08:31:52 +00:00 |
|
|
王怡栋
|
506bfa6bfa
|
Merge branch 'bug_33020' into 'master'
* Fix bug#33020
See merge request easycorp/zentaopms!7211
|
2023-03-16 08:31:33 +00:00 |
|
|
王怡栋
|
e0946d24b1
|
Merge branch 'bugfix/32991_lmy' into 'master'
* Fix bug #32991, #33018.
See merge request easycorp/zentaopms!7212
|
2023-03-16 08:30:21 +00:00 |
|
|
wangyidong
|
414c928ab5
|
Merge branch 'tsj_fixbug'
|
2023-03-16 16:28:24 +08:00 |
|
|
王怡栋
|
031a63a433
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/story/control.php
|
2023-03-16 08:27:36 +00:00 |
|
|
管西迎
|
3c193e60f3
|
Merge branch 'hufangzhou_bug_33008' into 'master'
* Fix bug #33008.
See merge request easycorp/zentaopms!7210
|
2023-03-16 08:24:24 +00:00 |
|
|
管西迎
|
c20fd40f8a
|
Merge branch 'sprint/hufangzhou_bug_32960' into 'master'
* Fix bug #32960.
See merge request easycorp/zentaopms!7214
|
2023-03-16 08:23:27 +00:00 |
|
|
hufangzhou
|
15c0a07a93
|
* Code for bug #32960.
|
2023-03-16 16:22:37 +08:00 |
|
|
tanghucheng
|
876f2bcc9e
|
* Fix bug for export bug.
|
2023-03-16 16:21:50 +08:00 |
|
|
tianshujie
|
1cb2dc55d4
|
* Code for fix bug #33014.
|
2023-03-16 16:21:33 +08:00 |
|
|
tianshujie
|
277ace51a0
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 16:17:21 +08:00 |
|
|
tianshujie
|
53666d1580
|
* Add the concept of default requirements.
|
2023-03-16 16:16:00 +08:00 |
|
|
hufangzhou
|
131dcf5f24
|
* Fix bug #32960.
|
2023-03-16 15:54:11 +08:00 |
|
|
caoyanyi
|
caae51a947
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 15:53:20 +08:00 |
|
|
caoyanyi
|
1bc1e3fc0f
|
* Adjust code.
|
2023-03-16 15:53:11 +08:00 |
|
|
guofeilong
|
e8e6cb2fad
|
* Adjust code .
|
2023-03-16 15:52:28 +08:00 |
|
|
guofeilong
|
3cf36bb69d
|
* Adjust code .
|
2023-03-16 15:47:18 +08:00 |
|
|
caoyanyi
|
eb9eb6220c
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 15:37:30 +08:00 |
|
|
caoyanyi
|
a99ed812d3
|
* Code for bug #33010.
|
2023-03-16 15:37:12 +08:00 |
|
|
liumengyi
|
5b3bef53c9
|
* Fix bug #33018.
|
2023-03-16 07:35:29 +00:00 |
|
|
孙广明
|
c941942ab5
|
Merge branch 'bugfix/32958_liumengyi' into 'master'
* Fix bug #32958,#33001.
See merge request easycorp/zentaopms!7208
|
2023-03-16 07:34:25 +00:00 |
|
|
孙广明
|
9c466c85dd
|
Merge branch 'bugfix/33003_lmy' into 'master'
* Fix bug #33003.
See merge request easycorp/zentaopms!7209
|
2023-03-16 07:33:29 +00:00 |
|
|
孙广明
|
a05afd6d3f
|
Merge branch 'bugfix/32954_liumengyi' into 'master'
* Fix bug #32995.
See merge request easycorp/zentaopms!7206
|
2023-03-16 07:32:18 +00:00 |
|
|
孙广明
|
db80488848
|
Merge branch 'bugifx/32867' into 'master'
* modify the getImageList method in the zahost model, fix bug #32867.
See merge request easycorp/zentaopms!7205
|
2023-03-16 07:32:00 +00:00 |
|
|
tianshujie
|
bfa97053ee
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 15:16:30 +08:00 |
|
|
tianshujie
|
90672816d8
|
* Code for task #76338.
|
2023-03-16 15:16:15 +08:00 |
|
|
caoyanyi
|
14b4b360e2
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 15:11:23 +08:00 |
|
|
caoyanyi
|
8d16faa47d
|
* Code for bug #33021.
|
2023-03-16 15:11:00 +08:00 |
|
|
zenggang
|
df52363be3
|
* Fix bug#33020
|
2023-03-16 07:10:56 +00:00 |
|
|
guofeilong
|
9d73aba355
|
* Adjust code .
|
2023-03-16 15:03:32 +08:00 |
|
|
guofeilong
|
4d7f1f8b0f
|
* Adjust code .
|
2023-03-16 14:57:46 +08:00 |
|
|
wangyidong
|
7329558777
|
* fix sonar error.
|
2023-03-16 14:46:48 +08:00 |
|
|
guofeilong
|
ad74bf740e
|
* Adjust code .
|
2023-03-16 14:45:57 +08:00 |
|
|
caoyanyi
|
8556ab4f31
|
* Code for bug #32995.
|
2023-03-16 14:33:21 +08:00 |
|
|
hufangzhou
|
d0792c47f9
|
* Fix bug #33008.
|
2023-03-16 14:32:31 +08:00 |
|
|
caoyanyi
|
d5ef16c75a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 14:32:19 +08:00 |
|
|
liumengyi
|
c7bd19144f
|
* Fix bug #32991.
|
2023-03-16 06:27:23 +00:00 |
|
|
guofeilong
|
91022eeaa6
|
* Adjust code .
|
2023-03-16 14:16:26 +08:00 |
|
|
caoyanyi
|
8e3935c8d7
|
* Modify font color.
|
2023-03-16 14:11:11 +08:00 |
|
|
caoyanyi
|
d435783cae
|
* Modify font color.
|
2023-03-16 14:09:01 +08:00 |
|
|
wangyidong
|
1fbb0b4c5f
|
* fix for upgrade.
|
2023-03-16 14:06:55 +08:00 |
|
|
liumengyi
|
1ae540dbe7
|
* Fix bug #33003.
|
2023-03-16 05:49:21 +00:00 |
|
|
caoyanyi
|
8949e97078
|
* Modify story page collapsed.
|
2023-03-16 13:42:01 +08:00 |
|
|
liumengyi
|
a168008406
|
* Fix bug #33001.
|
2023-03-16 05:29:54 +00:00 |
|
|
liumengyi
|
94d4b5419b
|
* Fix bug #32958.
|
2023-03-16 05:16:26 +00:00 |
|
|
liumengyi
|
34de9a5fe4
|
* Fix bug #32958.
|
2023-03-16 05:10:56 +00:00 |
|
|
caoyanyi
|
068b071db8
|
* Code for Bug #32994.
|
2023-03-16 11:29:36 +08:00 |
|
|
caoyanyi
|
4bd61993cc
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-16 11:20:02 +08:00 |
|
|
caoyanyi
|
813021747b
|
* Code for bug #32997, 32999.
|
2023-03-16 11:19:36 +08:00 |
|