Commit Graph
52521 Commits
Author SHA1 Message Date
hufangzhou e31c42d0be * Add the module for priv packages. 2023-03-15 14:42:52 +00:00
liumengyi 9b545e9ab2 * Add priv module. 2023-03-15 10:06:08 +00:00
hufangzhou 01fe1b42f8 * Add the module for priv package. 2023-03-15 09:08:48 +00:00
liumengyi 3a396b5f3b * Fix bug of edit priv. 2023-03-15 08:56:18 +00:00
liumengyi 88bd327551 * Fix bug of edit priv. 2023-03-15 08:48:09 +00:00
liumengyi dad452e3cb * Fix bug. 2023-03-15 08:33:23 +00:00
liumengyi 1ed298115c * Fix bug. 2023-03-15 08:12:02 +00:00
liumengyi 9f9194d4b4 * Fix bug of search priv. 2023-03-15 08:08:57 +00:00
hufangzhou 2f1505cce6 * Finish task #86260. 2023-03-15 07:00:59 +00:00
hufangzhou 87de3ae361 Merge branch 'master' into zentaopms_295 2023-03-15 05:17:00 +00:00
liumengyi 4e93cc5a86 * Change column order. 2023-03-15 05:13:53 +00:00
wangyidong ede15c92db * fix for upgrade for editor module. 2023-03-15 13:08:05 +08:00
liumengyi 83dc605a76 * Finish task #87017. 2023-03-15 05:03:54 +00:00
liumengyi 5f979fde1d * Optimize code for product manager. 2023-03-15 03:23:42 +00:00
管西迎 d0817bc8a0 Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.

See merge request easycorp/zentaopms!7193
2023-03-15 03:10:17 +00:00
liumengyi bfb7e9c1a6 * Finish task #86272. 2023-03-15 03:05:15 +00:00
liumengyi b91a24b66b * Finish task #86272. 2023-03-15 03:01:49 +00: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
hufangzhou 125a4384af * Add the new version. 2023-03-15 02:53:46 +00:00
wangyidong a22609e6b4 * fix bug. 2023-03-15 10:44:18 +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
wangyidong c2e752205b * add priv for group relation. 2023-03-14 16:15:22 +08:00
wangxuepeng ca5a98e5ad Fixed bug #87020. 2023-03-14 07:37:42 +00:00
liumengyi ff09f1a05f * Finish task #87015. 2023-03-14 07:11:43 +00:00
liumengyi d33e462a09 * Optimize code. 2023-03-14 07:11:14 +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
guofeilong edefed8510 * Adjust code for editManagerPrivbycard view . 2023-03-14 14:44:55 +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
hufangzhou 1608975646 Merge branch 'zentaopms_295' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-03-14 05:29:49 +00:00
tianshujie 51f680f78f * Fix bug 32895. 2023-03-14 13:17:39 +08:00
hufangzhou 01aaf60e09 * Merge master. 2023-03-14 05:15:27 +00:00
wangxuepeng 7f45a3d34f * Fixed bug #87025. 2023-03-14 05:09:14 +00:00