Commit Graph
52592 Commits
Author SHA1 Message Date
liumengyi 2d86fcc94a * Finish task #87763. 2023-03-22 10:54:53 +08:00
liumengyi 062e80ac17 * Finish task #87759. 2023-03-22 10:12:27 +08:00
liumengyi b50f94c530 * Finish task #87759. 2023-03-22 10:00:25 +08:00
liumengyi 036b327f15 * Finish task #87758. 2023-03-21 08:31:36 +00:00
liumengyi 508f8dbb0e * Fix bug #87754. 2023-03-20 08:39:40 +00:00
liumengyi c92b4c8615 * Finish task #87753, and fix bug of edit card. 2023-03-20 06:21:06 +00: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
孙广明 bcc9e6a0b2 Merge branch 'bugfix/33054_lmy' into 'master'
* Fix bug #33054.

See merge request easycorp/zentaopms!7224
2023-03-17 05:23:30 +00:00
wangyidong db49612b75 * fix bug #33059. 2023-03-17 13:06:38 +08:00
王怡栋 6ee765c362 Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7222
2023-03-17 03:10:31 +00:00
王怡栋 e980643cd7 Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #33060 .

See merge request easycorp/zentaopms!7225
2023-03-17 03:09:30 +00:00
guofeilong d2f0e788fa * Code for bug #33060 . 2023-03-17 11:08:31 +08:00
tianshujie bd8dc27a36 * Code for bug #32987. 2023-03-17 11:07:00 +08:00
liumengyi d2632c11fd * Fix bug #33054. 2023-03-17 03:06:40 +00:00
孙广明 10a4dac396 Merge branch 'pipeline_jenkins_ly' into 'master'
Pipeline jenkins ly

See merge request easycorp/zentaopms!7223
2023-03-17 02:46:20 +00:00
wangyidong c905c9a331 * fix for doc when upgrade. 2023-03-17 10:39:19 +08:00
tianshujie 9a3e8158dd Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 10:37:50 +08:00
tianshujie 2955d16b91 * Code for fix bug #27599. 2023-03-17 10:37:32 +08:00
caoyanyi 7a51621ef4 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 10:19:08 +08:00
caoyanyi 872a14aa0c * Adjust code. 2023-03-17 10:18:54 +08:00
liyang 71501dbc69 * Fix xuanxuan notice. 2023-03-17 10:10:29 +08:00
tianshujie cc84152bbd Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 09:55:18 +08:00
tianshujie 4815187c32 * Code for fix bug #33035. 2023-03-17 09:54:59 +08:00
caoyanyi 4669b0218c * Adjust code. 2023-03-17 09:54:55 +08:00
caoyanyi 6712de8a01 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-17 09:51:21 +08:00
caoyanyi 675a28f888 * Modify editor default style. 2023-03-17 09:51:01 +08:00
王怡栋 8cb51c6118 Merge branch 'dev/gfl_fix_bug' into 'master'
* Code for bug #32973.

See merge request easycorp/zentaopms!7220
2023-03-17 01:21:39 +00:00
wangxuepeng 3728a41230 * Fix bug 33027. 2023-03-17 01:20:43 +00:00
guofeilong ec80eedcc9 * Code for bug #32973. 2023-03-17 09:19:36 +08:00