 xieqiyu
|
214602e4d7
|
* Fix bug#26428.
|
2023-03-20 07:48:13 +00:00 |
|
|
王怡栋
|
41a455064a
|
Merge branch 'hufangzhou_bug_33088' into 'master'
* Fix bug #33088.
See merge request easycorp/zentaopms!7242
|
2023-03-20 07:41:47 +00:00 |
|
|
王怡栋
|
1ea6565f36
|
Merge branch 'bugfix/33091_lmy' into 'master'
* Fix bug #33091, #33093.
See merge request easycorp/zentaopms!7241
|
2023-03-20 07:41:05 +00:00 |
|
|
王怡栋
|
a3fa99f8e4
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7240
|
2023-03-20 07:40:13 +00:00 |
|
|
hufangzhou
|
5bc154a69b
|
* Fix bug #33088.
|
2023-03-20 15:39:28 +08:00 |
|
|
liumengyi
|
fbf1a7a0bb
|
* Fix bug #33093.
|
2023-03-20 07:26:56 +00:00 |
|
|
liumengyi
|
87992c852d
|
* Fix bug #33091.
|
2023-03-20 07:23:26 +00:00 |
|
|
caoyanyi
|
e357081223
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-20 15:15:03 +08:00 |
|
|
caoyanyi
|
597131cd71
|
* Code for bug #33089, modify second menu active.
|
2023-03-20 15:14:23 +08:00 |
|
|
王怡栋
|
862d7c52b4
|
Merge branch 'fixbug_gfl' into 'master'
* Code for task #33090
See merge request easycorp/zentaopms!7238
|
2023-03-20 06:57:15 +00:00 |
|
|
guofeilong
|
45a885ac57
|
* Code for task #33090
|
2023-03-20 14:54:33 +08:00 |
|
|
wangyidong
|
5ff909911a
|
* fix bug #33079.
|
2023-03-20 14:53:22 +08:00 |
|
|
王怡栋
|
76fcfa66b5
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #33023.
See merge request easycorp/zentaopms!7237
|
2023-03-20 06:36:48 +00:00 |
|
|
王怡栋
|
f40b15a253
|
Merge branch 'fixbug_gfl' into 'master'
* Code for bug #32969
See merge request easycorp/zentaopms!7236
|
2023-03-20 06:36:07 +00:00 |
|
|
田淑杰
|
e6ef9f4330
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-20 14:27:24 +08:00 |
|
|
guofeilong
|
3291d750b4
|
* Code for bug #33072.
|
2023-03-20 14:26:43 +08:00 |
|
|
田淑杰
|
2cdc998a11
|
* Fix bug #33070.
|
2023-03-20 14:26:27 +08:00 |
|
|
caoyanyi
|
d455f37c6c
|
* Modify editor file save tip.
|
2023-03-20 14:10:07 +08:00 |
|
|
Yagami
|
4c4daf6a2e
|
* Fix bug #33084.
|
2023-03-20 14:06:52 +08:00 |
|
|
田淑杰
|
a142ed9064
|
* Fix bug #29685.
|
2023-03-20 14:05:20 +08:00 |
|
|
wangyuting2
|
4bf396b34c
|
* Fix bug #33023.
|
2023-03-20 13:59:10 +08:00 |
|
|
guofeilong
|
d063eb85db
|
* Code for bug #32969
|
2023-03-20 13:57:38 +08:00 |
|
|
王怡栋
|
55aba37fbb
|
Merge branch 'fixbug_gfl' into 'master'
* Code for bug #33065
See merge request easycorp/zentaopms!7235
|
2023-03-20 05:35:20 +00:00 |
|
|
guofeilong
|
4d23260865
|
* Code for bug #33065
|
2023-03-20 13:33:44 +08:00 |
|
|
王怡栋
|
81dcf18c1d
|
Merge branch 'hufangzhou_bug_33080' into 'master'
* Fix bug #33080.
See merge request easycorp/zentaopms!7233
|
2023-03-20 05:26:36 +00:00 |
|
|
王怡栋
|
ad8ed95aff
|
Merge branch 'fixbug_gfl' into 'master'
* Adjust code .
See merge request easycorp/zentaopms!7234
|
2023-03-20 05:26:07 +00:00 |
|
|
hufangzhou
|
277fe6b473
|
* Fix bug #33080.
|
2023-03-20 13:22:07 +08:00 |
|
|
guofeilong
|
d9c686bb3e
|
* Adjust code .
|
2023-03-20 13:20:50 +08:00 |
|
|
王怡栋
|
c1259d1e77
|
Merge branch 'sprint/feedback2356' into 'master'
Sprint/feedback2356
See merge request easycorp/zentaopms!7140
|
2023-03-20 02:25:54 +00:00 |
|
|
王怡栋
|
ba40010658
|
Merge branch 'wxp_bug86288' into 'master'
* Fixed #bug86288.
See merge request easycorp/zentaopms!7182
|
2023-03-20 02:25:00 +00:00 |
|
|
王怡栋
|
8d98b6fc98
|
Merge branch 'wxp_bug33027' into 'master'
* Fix bug 33027.
See merge request easycorp/zentaopms!7221
|
2023-03-20 02:24:37 +00:00 |
|
|
王怡栋
|
bfff81cbd1
|
Merge branch 'pipeline_jenkins_ly' into 'master'
- Delete log dir.
See merge request easycorp/zentaopms!7226
|
2023-03-20 02:23:27 +00:00 |
|
|
王怡栋
|
fdf003502f
|
Merge branch 'wxp_bug33054' into 'master'
* Fix bug 33045.
See merge request easycorp/zentaopms!7230
|
2023-03-20 02:23:03 +00:00 |
|
|
王怡栋
|
5fb362277e
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7232
|
2023-03-20 01:57:18 +00:00 |
|
|
曹延义
|
a186336a67
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-20 01:45:21 +00:00 |
|
|
wangyidong
|
d3149400b0
|
* fix bug #32095.
|
2023-03-17 15:57:51 +08:00 |
|
|
王怡栋
|
e3c0cafc26
|
Merge branch 'hufangzhou_addBtn' into 'master'
* Add close btn for requirement under project app.
See merge request easycorp/zentaopms!7227
|
2023-03-17 07:52:20 +00:00 |
|
|
王怡栋
|
2063d133e9
|
Merge branch 'hufangzhou_undefined' into 'master'
* Fix bug for undefined variable.
See merge request easycorp/zentaopms!7229
|
2023-03-17 07:51:59 +00:00 |
|
|
liyang
|
67e409edd4
|
* Restore gitlab ci yaml.
|
2023-03-17 15:43:42 +08:00 |
|
|
王怡栋
|
ebfe0514bd
|
Merge branch 'devops_unjenkins' into 'master'
* Restore jenkins
See merge request easycorp/zentaopms!7231
|
2023-03-17 07:36:22 +00:00 |
|
|
田淑杰
|
3bcbe37b8f
|
* Fix bug #33074.
|
2023-03-17 15:21:31 +08:00 |
|
|
wangxuepeng
|
bd0979b334
|
* Fix bug 33045.
|
2023-03-17 07:17:07 +00:00 |
|
|
田淑杰
|
2ea990f87b
|
* Fix bug #33070.
|
2023-03-17 14:50:17 +08:00 |
|
|
zenggang
|
2922e67a34
|
* Restore jenkins
|
2023-03-17 06:47:51 +00:00 |
|
|
hufangzhou
|
9ee981f782
|
* Fix bug for undefined variable.
|
2023-03-17 14:41:10 +08:00 |
|
|
caoyanyi
|
37933803ff
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-17 14:08:12 +08:00 |
|
|
caoyanyi
|
4933578964
|
* Replace self to static.
|
2023-03-17 14:06:58 +08:00 |
|
|
caoyanyi
|
43f40e327f
|
- Remove unused file.
|
2023-03-17 14:03:36 +08:00 |
|
|
hufangzhou
|
868dda193c
|
* Add close btn for requirement under project app.
|
2023-03-17 13:50:06 +08:00 |
|
|
liyang
|
5315a31345
|
- Delete log dir.
|
2023-03-17 13:28:35 +08:00 |
|