Commit Graph
54235 Commits
Author SHA1 Message Date
刘刚 39c0230212 Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Add bi screen sql.

See merge request easycorp/zentaopms!7475
2023-04-19 06:55:26 +00:00
wangyidong d9e21d706a * fix bug #34362,34365,34361. 2023-04-19 14:50:43 +08:00
wangyuting2 5d2755b0e8 * Add bi screen sql. 2023-04-19 14:46:41 +08:00
王怡栋 200a0c6635 Merge branch 'fixbug/liumengyi_20185' into 'master'
* Fix bug #20185.

See merge request easycorp/zentaopms!7473
2023-04-19 05:59:52 +00:00
wangyidong 7659babe92 * fix bug #34364. 2023-04-19 13:55:17 +08:00
liumengyi b3b0073dd9 * Fix bug #20185. 2023-04-19 13:37:32 +08:00
王怡栋 5d56042091 Merge branch 'cyy_fixbug' into 'master'
* Modify book doc type.

See merge request easycorp/zentaopms!7468
2023-04-19 05:34:00 +00:00
王怡栋 1af597ef22 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7465
2023-04-19 05:33:42 +00:00
tianshujie 43fa259a14 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 13:13:35 +08:00
朱金勇 51a43d37d6 * Fix date display in task module. 2023-04-19 04:34:10 +00:00
朱金勇 2fcff8c54a * Fix bug#34335. 2023-04-19 03:43:01 +00:00
朱金勇 31d42cf359 * Fix db for dm. 2023-04-19 03:24:41 +00:00
tianshujie 4146e5551a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 11:21:38 +08:00
wangyidong 506b786a33 * fix bug #34367. 2023-04-19 11:20:44 +08:00
tianshujie da8f3ade7f * Fix bug #34350. 2023-04-19 10:39:19 +08:00
刘刚 03f2d486a6 Merge branch 'fix_bug_qxz' into 'master'
* Update echarts dist for radar chart bug.

See merge request easycorp/zentaopms!7467
2023-04-19 02:38:19 +00:00
刘刚 b3457becaa Merge branch 'goview' into 'master'
* Update go-view dist.

See merge request easycorp/zentaopms!7466
2023-04-19 02:38:10 +00:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +08:00
朱金勇 ed55bb7980 * Fix type error. 2023-04-19 02:28:58 +00:00
qixinzhi d4f3aa0010 * Update echarts dist for radar chart bug. 2023-04-19 02:26:11 +00:00
tianshujie 32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
qixinzhi c601c0e0b9 * Update go-view dist. 2023-04-19 02:18:29 +00:00
朱金勇 ac9801937e * Fix bug#34368 2023-04-19 02:17:23 +00:00
朱金勇 e7cc2b2e5e * Fix sync repo. 2023-04-19 02:10:10 +00:00
wangyidong 17c3ba6b68 * fix bug. 2023-04-19 10:08:38 +08:00
朱金勇 12afcff9c9 * Fix bug: create repo. 2023-04-19 01:55:45 +00:00
tianshujie 51cc9adb8f * Fix bug #34341. 2023-04-19 09:49:49 +08:00
wangyidong 64ee5c7625 * code for remove empty data in block. 2023-04-19 09:44:24 +08:00
朱金勇 72155fc3b8 * Fix bug for dmdb. 2023-04-19 01:41:34 +00:00
朱金勇 17b58fa3a7 * Fix create kanban. 2023-04-19 01:30:10 +00:00
caoyanyi e8a3ca0fc7 * Modify book doc type. 2023-04-19 09:28:15 +08:00
朱金勇 d9d7ecd377 * Fix bug#34349. 2023-04-19 01:17:39 +00:00
tianshujie dd8fa67a12 * Fix bug #34359. 2023-04-19 09:10:42 +08:00
朱金勇 dbb06251e2 * Fix bug#34330. 2023-04-19 01:10:13 +00:00
tianshujie 06c8d50719 * Modify the editor style. 2023-04-19 09:09:26 +08:00
tianshujie c2d8da46ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 09:07:21 +08:00
tianshujie 3062276963 * Check whether the field already exists. 2023-04-19 09:05:13 +08:00
朱金勇 55e12b687e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-19 01:01:32 +00:00
王怡栋 e3b14714fb Merge branch 'cyy_fixbug' into 'master'
* Modify catalog sort.

See merge request easycorp/zentaopms!7463
2023-04-19 00:58:43 +00:00
caoyanyi 4396f3d1b4 * Adjust code. 2023-04-19 08:57:37 +08:00
朱金勇 b310d35aac * Fix bug#34345. 2023-04-19 00:57:05 +00:00
王怡栋 a2eddc80bc Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Code for task #91380 .

See merge request easycorp/zentaopms!7464
2023-04-19 00:56:21 +00:00
guofeilong 06ec49b150 * Code for task #91380 . 2023-04-19 08:53:48 +08:00
朱金勇 2ca80b1aa3 * Fix bug#34346. 2023-04-19 00:53:12 +00:00
caoyanyi 692fb9e6cc * Adjust code. 2023-04-19 08:47:44 +08:00
caoyanyi e15e696e8d * Modify catalog sort. 2023-04-19 08:44:27 +08:00
wangyidong dffb74c07d * code for task #91381. 2023-04-18 17:35:22 +08:00
王怡栋 a88eaaeace Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Adjust code for task #91379 .

See merge request easycorp/zentaopms!7462
2023-04-18 09:13:54 +00:00
王怡栋 0af66d19bb Merge branch 'fixbug/liumengyi_33143' into 'master'
* Fix bug #33143.

See merge request easycorp/zentaopms!7460
2023-04-18 09:13:07 +00:00
王怡栋 3c85d5aac3 Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug

See merge request easycorp/zentaopms!7457
2023-04-18 09:12:42 +00:00