Commit Graph
52720 Commits
Author SHA1 Message Date
tianshujie 703efde24e Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 14:57:46 +08:00
tianshujie fbcca8e708 * Code for finish task #87405. 2023-03-22 14:57:34 +08:00
guofeilong 0de87f1c77 * Adjust code . 2023-03-22 14:43:20 +08:00
tianshujie c7cd5080e8 * Code for finish task #87405. 2023-03-22 14:38:08 +08:00
tianshujie 34f4a61fd3 * Code for finish task #87405. 2023-03-22 14:18:52 +08:00
tianshujie a7a1ff52bf * Code for finish task #87405. 2023-03-22 13:57:36 +08:00
tianshujie dbb17e187a * Code for finish task #87405. 2023-03-22 13:51:46 +08:00
guofeilong d761a31c32 * Adjust code . 2023-03-22 13:28:52 +08:00
guofeilong dfa08ce91e * Adjust code . 2023-03-22 13:13:58 +08:00
caoyanyi 8451e4b13e * Add locate params. 2023-03-22 11:25:04 +08:00
guofeilong db55553f00 * Adjust code . 2023-03-22 11:08:18 +08:00
tianshujie 54c532bdda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 10:48:25 +08:00
tianshujie cdd6b554d4 * Change the link type document to text type. 2023-03-22 10:47:42 +08:00
caoyanyi a8ae5f0813 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-22 10:44:35 +08:00
caoyanyi f6cad26977 * Add locate. 2023-03-22 10:44:26 +08:00
guofeilong 83ba0f4755 * Adjust code . 2023-03-22 10:20:11 +08:00
guofeilong c4d670b812 * Adjust code . 2023-03-22 10:11:27 +08:00
tianshujie f48c9e1b97 * Code for finish task #87406. 2023-03-22 10:10:53 +08:00
caoyanyi 63a02516bc * Add priv check for module tree. 2023-03-22 10:03:24 +08:00
guofeilong 4e49095d73 * Adjust code . 2023-03-22 09:54:40 +08:00
guofeilong 1a0c7fae19 * Adjust code . 2023-03-22 09:08:14 +08:00
guofeilong e276eeb883 * Adjust code / 2023-03-22 09:01:39 +08:00
guofeilong b5d3b6468a * Code for task#99371 2023-03-21 17:16:57 +08:00
caoyanyi c7cb7e96c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 17:00:05 +08:00
tianshujie a99b3fea8c * Modify module locate. 2023-03-21 16:57:46 +08:00
tianshujie 61a44bc7f4 * Code for finish task #87406. 2023-03-21 16:24:34 +08:00
tianshujie 4297764947 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 16:02:27 +08:00
tianshujie 8944424005 * Code for finish task #87405. 2023-03-21 16:01:35 +08:00
wangyidong 6ecac70d85 * fix bug #33172. zentaopms_18.3 2023-03-21 15:44:47 +08:00
guofeilong c19937a56d * Adjust code . 2023-03-21 15:04:01 +08:00
caoyanyi 0362953766 * Modify annex lib locate. 2023-03-21 14:41:15 +08:00
hufangzhou 8660cc9663 * Remove the unsed code. 2023-03-21 14:18:26 +08:00
孙广明 da041f4b6c Merge branch 'sprint/hufangzhou_bug_closeBtn' into 'master'
* Fix bug for double close button.

See merge request easycorp/zentaopms!7258
2023-03-21 06:14:00 +00:00
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
caoyanyi f01144ae0a * Modify api lib param. 2023-03-21 14:07:16 +08:00
caoyanyi 6e4cd0dda8 * Modify doc module locate. 2023-03-21 14:04:37 +08:00
孙广明 5f20f3ad9c Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33127.

See merge request easycorp/zentaopms!7257
2023-03-21 06:04:36 +00:00
Yagami 3f307b913d * Fix bug #33154. 2023-03-21 14:02:36 +08:00
liumengyi 7d1d39187f * Fix bug #33139. 2023-03-21 05:39:04 +00:00
王怡栋 57d9038f3a Merge branch 'revertCode' into 'master'
* Revert the code.

See merge request easycorp/zentaopms!7256
2023-03-21 05:29:37 +00:00
王怡栋 cf737b035e Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
2023-03-21 05:27:39 +00:00
王怡栋 f51c04d4fc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7252
2023-03-21 05:26:30 +00:00
王怡栋 0c1008f8a1 Merge branch 'hufangzhou_bug_33117' into 'master'
* Fix bug #33117.

See merge request easycorp/zentaopms!7250
2023-03-21 05:25:30 +00:00
hufangzhou d29643cf57 * Revert the code. 2023-03-21 13:25:02 +08:00
wangyidong b5127c2bb8 * fix bug #33100. 2023-03-21 13:15:17 +08:00
孙广明 f5e25fe88d Merge branch 'sprint/scx_taskapi' into 'master'
* Fix bug for task multi.

See merge request easycorp/zentaopms!7254
2023-03-21 05:12:33 +00:00
liumengyi 1037f1aa82 * Fix bug #33139. 2023-03-21 03:27:35 +00:00
liumengyi 346ce0c994 * Fix bug #33140. 2023-03-21 03:25:20 +00:00
宋辰轩 4a3b0fa07e * Fix bug for task multi. 2023-03-21 11:23:09 +08:00
guofeilong 256029b799 * Adjust code / 2023-03-21 11:22:28 +08:00