Commit Graph
54157 Commits
Author SHA1 Message Date
tianshujie 9a439c9cd5 * Fix bug #34312. 2023-04-18 15:36:16 +08:00
tianshujie f91245b985 * Fix bug #34315. 2023-04-18 15:14:45 +08:00
tianshujie 1fe920f873 * Compatible with Quick Edition project dropdown issues. 2023-04-18 15:04:09 +08:00
tianshujie ab04e42c0b * Fix bug #34316. 2023-04-18 14:44:27 +08:00
tianshujie f9f3549e9d Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:18:27 +08:00
tianshujie 87f226f407 * Modify the document block style. 2023-04-18 14:18:14 +08:00
tianshujie 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
tianshujie 61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +08:00
王怡栋 f79c5063a4 Merge branch 'fixbug/liumengyi_33917' into 'master'
* Fix bug #33917.

See merge request easycorp/zentaopms!7452
2023-04-18 05:50:39 +00:00
tianshujie 0f49022d88 * Fix bug #34260. 2023-04-18 13:49:55 +08:00
王怡栋 70a1625a13 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34288, Modify bottom height.

See merge request easycorp/zentaopms!7450
2023-04-18 05:49:05 +00:00
tianshujie d165ce39b9 * Code for task #91378. 2023-04-18 13:40:47 +08:00
wangyidong dcc3fd9331 * fix bug #34278. 2023-04-18 13:33:09 +08:00
liumengyi 094f8f5f60 * Fix bug #33917. 2023-04-18 13:31:58 +08:00
caoyanyi eceeb4bd04 * Modify language. 2023-04-18 13:31:42 +08:00
刘刚 5a4c096b16 Merge branch 'master_xieqiyu_addConfig' into 'master'
* Add config.

See merge request easycorp/zentaopms!7451
2023-04-18 05:24:06 +00:00
xieqiyu 421b7933b0 * Add config. 2023-04-18 05:22:38 +00:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
朱金勇 d96a77e314 * Fix bug#34233. 2023-04-18 04:31:10 +00:00
朱金勇 c9637a0418 * Fix bug#34305. 2023-04-18 04:22:09 +00:00
朱金勇 72c289b854 * Fix bug#34247. 2023-04-18 04:11:46 +00:00
caoyanyi 77605330f2 * Modify catalog select style. 2023-04-18 11:16:24 +08:00
caoyanyi ab7bfba897 * Fix bug #34185, Modify sidebar-toggle. 2023-04-18 11:09:19 +08:00
tianshujie 775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
liugang 44387b7b97 * Remove unused files extened in the report extension. 2023-04-18 03:00:10 +00:00
tianshujie b4dc730385 * Fix bug #34284. 2023-04-18 10:56:15 +08:00
caoyanyi 8104185c61 * Fix bug #34288, Modify bottom height. 2023-04-18 10:47:35 +08:00
王怡栋 05217c63e9 Merge branch 'tsj_sort' into 'master'
Tsj sort

See merge request easycorp/zentaopms!7448
2023-04-18 02:44:57 +00:00
tianshujie 9df90e87a5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 10:44:37 +08:00
tianshujie 4a46d918b1 * Code for task #91391. 2023-04-18 10:43:03 +08:00
王怡栋 af4d04889c Merge branch 'fixbug/liumengyi_34022' into 'master'
* Fix bug #34022, #34028.

See merge request easycorp/zentaopms!7446
2023-04-18 02:41:41 +00:00
王怡栋 29f2ba65e3 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34293,34299.

See merge request easycorp/zentaopms!7444
2023-04-18 02:41:20 +00:00
王怡栋 46aea7bf9e Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Code for task #91379 .

See merge request easycorp/zentaopms!7449
2023-04-18 02:41:01 +00:00
guofeilong 367be9d52a * Code for task #91379 . 2023-04-18 10:36:34 +08:00
tianshujie 7605903fe9 * Fix bug #34274. 2023-04-18 10:29:48 +08:00
tianshujie 32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +08:00
孙广明 c23bec23fd Merge branch 'pipeline_jenkins_ly' into 'master'
* Fix xuanxuan notice in Jenkinsfile.

See merge request easycorp/zentaopms!7434
2023-04-18 02:16:40 +00:00
caoyanyi 8e69054983 * Fix bug #32491, Adjust to no increase in traffic within 3 seconds. 2023-04-18 10:15:07 +08:00
孙广明 e4be890795 Merge branch 'sprint/scx_modidypng' into 'master'
* Modify png and modify dimension name.

See merge request easycorp/zentaopms!7447
2023-04-18 02:09:38 +00:00
宋辰轩 55a2bcf29d * Modify png and modify dimension name. 2023-04-18 10:07:10 +08:00
liumengyi 13ce2a32b3 * Fix bug #34022, #34028. 2023-04-18 10:04:09 +08:00
刘刚 f92b0f94f1 Merge branch 'goview' into 'master'
* Updata go-view dist.

See merge request easycorp/zentaopms!7445
2023-04-18 01:49:46 +00:00
caoyanyi 99ed7687cb * Fix bug #34292. 2023-04-18 09:48:51 +08:00
qixinzhi e496b92a37 * Updata go-view dist. 2023-04-18 01:34:26 +00:00
wangyidong 0ef2c25165 * fix bug. 2023-04-18 09:16:34 +08:00
朱金勇 a5771fa2d8 * Fix bug#34247. 2023-04-18 01:14:19 +00:00
tianshujie b4c325c56e * Code for task #91378. 2023-04-18 09:13:45 +08:00
caoyanyi 07a5cb6f94 * Fix bug #34293,34299. 2023-04-18 09:07:50 +08:00
tianshujie 59afadec4a * Code for task #91389,91390. 2023-04-18 09:03:43 +08:00
朱金勇 28852fb5fe * Fix bug: order error. 2023-04-18 00:53:06 +00:00