Commit Graph
52397 Commits
Author SHA1 Message Date
tianshujie 445323e278 * Modify product line language. 2023-03-15 11:00:45 +08:00
tianshujie c513f5cb95 * Modify product line language. 2023-03-15 10:59:36 +08:00
tianshujie 5f6f52e86e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 10:57:18 +08:00
tianshujie dc8fdfb263 * Modify product line language. 2023-03-15 10:56:13 +08:00
管西迎 93ca7dda5f Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.

See merge request easycorp/zentaopms!7192
2023-03-15 02:55:12 +00:00
tianshujie bdc83c7088 * Modify product line language. 2023-03-15 10:54:45 +08:00
tianshujie cd925cee0e * Modify product line language. 2023-03-15 10:53:15 +08:00
tianshujie 3756e90cfd * Fix bug 32929. 2023-03-15 10:41:40 +08:00
tianshujie 7e17061d3d * Fix bug 32928. 2023-03-15 10:41:33 +08:00
wangyidong a946e5edeb Merge branch 'easycorp/zentaopms-sprint/hufangzhou_task_87019' 2023-03-15 09:44:59 +08:00
tianshujie e49090d03a * Fix bug 32911. 2023-03-15 09:43:54 +08:00
王怡栋 49c755c8a6 Merge branch 'tsj_fixbug' into 'master'
* Add skip stash page.

See merge request easycorp/zentaopms!7188
2023-03-15 01:36:22 +00:00
tianshujie 2b7cff9090 * Fixed list title color issues. 2023-03-15 09:22:49 +08:00
孙广明 d235b8e924 Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.

See merge request easycorp/zentaopms!7184
2023-03-14 09:15:08 +00:00
孙广明 bcc201b7a5 Merge branch 'wxp_bug87025' into 'master'
* Fixed bug #87025.

See merge request easycorp/zentaopms!7185
2023-03-14 09:11:42 +00:00
孙广明 5476ddf0c3 Merge branch 'fixbug/32817' into 'master'
* Fix bug #32817, #32818.

See merge request easycorp/zentaopms!7180
2023-03-14 09:11:00 +00:00
liumengyi 1d16c63d87 * Fix bug of task #87013. 2023-03-14 08:57:00 +00:00
孙广明 6820d74967 Merge branch 'sprint/scx_storyapibug' into 'master'
* Fix execution story api bug.

See merge request easycorp/zentaopms!7161
2023-03-14 08:54:28 +00:00
孙广明 96c39649bb Merge branch 'wxp_bug87020' into 'master'
Fixed bug #87020.

See merge request easycorp/zentaopms!7189
2023-03-14 08:52:43 +00:00
wangxuepeng ca5a98e5ad Fixed bug #87020. 2023-03-14 07:37:42 +00:00
tianshujie 25cffc0574 Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-14 15:06:01 +08:00
tianshujie 8580b13627 * Fix bug 32911. 2023-03-14 15:05:42 +08:00
caoyanyi 3a06344d55 * Modify program language. 2023-03-14 15:03:50 +08:00
caoyanyi 2d35e8f3c0 * Modify language for lite menu. 2023-03-14 14:32:50 +08:00
tianshujie bc7855e7e3 * Add skip stash page. 2023-03-14 13:50:17 +08:00
王怡栋 fc25250f11 Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32895.

See merge request easycorp/zentaopms!7186
2023-03-14 05:45:04 +00:00
王怡栋 92503a59fc Merge branch 'devops_zg' into 'master'
* Adjust deleted branch

See merge request easycorp/zentaopms!7183
2023-03-14 05:44:38 +00:00
王怡栋 6a991c30fb Merge branch 'dev/gfl_fix_bug' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7187
2023-03-14 05:43:02 +00:00
guofeilong 622779f0d9 * Adjust code . 2023-03-14 13:40:07 +08:00
tianshujie 51f680f78f * Fix bug 32895. 2023-03-14 13:17:39 +08:00
wangxuepeng 7f45a3d34f * Fixed bug #87025. 2023-03-14 05:09:14 +00:00
liumengyi a33306bf90 * Fix bug #32881. 2023-03-14 05:05:46 +00:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
zenggang e5c4bec3ed * Adjust deleted branch 2023-03-14 02:29:17 +00:00
hufangzhou 14f289ff97 * Finish task #87019. 2023-03-13 09:44:13 +00:00
王怡栋 c8afb978a5 Merge branch 'dev/gfl_fix_bug' into 'master'
Dev/gfl fix bug

See merge request easycorp/zentaopms!7181
2023-03-13 07:56:54 +00:00
guofeilong c2fde80cda * Adjust code . 2023-03-13 15:41:40 +08:00
liumengyi 9728298427 * Fix bug of task #87014. 2023-03-13 07:37:04 +00:00
tianshujie 8dea1cc0a1 Merge branch 'dev/gfl_fix_bug' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_fix_bug 2023-03-13 15:30:54 +08:00
tianshujie 23f362cd59 * Fixed language item issues. 2023-03-13 15:30:24 +08:00
caoyanyi 61b782d0d3 * Adjust code. 2023-03-13 15:27:14 +08:00
caoyanyi db1ae60517 * Adjust code. 2023-03-13 15:23:49 +08:00
caoyanyi 355a5cd1d5 * Hide work flow module form stash. 2023-03-13 15:11:54 +08:00
tianshujie c759094ba5 * Add skip stash page and method. 2023-03-13 15:10:42 +08:00
liumengyi 637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
tianshujie 6cd6ba3858 * Add skip stash page. 2023-03-13 14:55:29 +08:00
tianshujie 8e99a5bf20 * Modify class for product list. 2023-03-13 14:54:53 +08:00
tianshujie 80bea78979 * Add skip stash pager and method. 2023-03-13 14:39:37 +08:00
tianshujie 16c28d0f70 * Add skip stash class. 2023-03-13 14:30:09 +08:00
caoyanyi b4850ed782 * Add skip method page form stash. 2023-03-13 14:28:05 +08:00