Commit Graph
53299 Commits
Author SHA1 Message Date
wangyuting2 8ca58ff327 * Finish task #90147. 2023-04-03 16:52:58 +08:00
王怡栋 a3b7c7fe0b Merge branch 'dev/gfl_add_class_checkbox-indeterminate-block' into 'master'
Dev/gfl add class checkbox indeterminate block

See merge request easycorp/zentaopms!7296
2023-04-03 08:41:58 +00:00
郭飞龙 2200faa625 * Adjust code . 2023-04-03 08:41:12 +00:00
guofeilong e2328f2051 * Adjust code . 2023-04-03 16:21:04 +08:00
liugang 63d41661b8 * Add dimension module, finish task #90072. 2023-04-03 08:14:46 +00:00
guofeilong d5c48a1e9c * Adjust code . 2023-04-03 16:05:52 +08:00
guofeilong 3bb9bd377c * Adjust right: 4px to left: 4px; 2023-04-03 15:37:10 +08:00
guofeilong a92dc1327e * Adjust code . 2023-04-03 15:31:54 +08:00
guofeilong 0040359ad4 * Adjust code for bug #33643 . 2023-04-03 14:53:06 +08:00
王怡栋 bf2ab751c6 Merge branch 'release/zentaopms_18.3' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7294
2023-04-03 06:43:49 +00:00
guofeilong 1bf63e84c0 * Adjust code . 2023-04-03 14:42:56 +08:00
王怡栋 6147360f3b Merge branch 'daitingting_task_#89952' into 'master'
* Finish task #89952.

See merge request easycorp/zentaopms!7292
2023-04-03 06:35:38 +00:00
王怡栋 511a5fb0bd Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7293
2023-04-03 06:29:21 +00:00
guofeilong e41b4397f9 * Adjust code . 2023-04-03 14:27:14 +08:00
daitingting 26161924c6 * Finish task #89952. 2023-04-03 14:19:49 +08:00
tianshujie 85474574ca Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 14:13:21 +08:00
tianshujie c3b988692f * Code for task #89927. 2023-04-03 14:13:05 +08:00
guofeilong 24fe4d80ef * Adjust code . 2023-04-03 13:55:41 +08:00
tianshujie 72abd88a86 * Code for task #89927. 2023-04-03 13:51:50 +08:00
wangyidong 28feaa2a2c * code for task #89524. 2023-04-03 13:41:37 +08:00
tianshujie baf5aeba2a * Code for task #89927. 2023-04-03 13:34:21 +08:00
liugang 2336997c39 * Sort the privileges of screen, finish task #90070,90071, cost 1h, left 0h. 2023-04-03 05:33:36 +00:00
guofeilong 60e176c5bc * Adjust code . 2023-04-03 13:22:26 +08:00
朱金勇 04a77a6879 Merge branch 'feishu' into 'master'
* Support markdown for feishu webhook.

See merge request easycorp/zentaopms!7289
2023-04-03 03:28:39 +00:00
鲁飞 37445a4968 * Support markdown for feishu webhook. 2023-04-03 03:28:39 +00:00
tianshujie df512b264f Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 11:26:57 +08:00
tianshujie 3f9f9fbc5b * Code for task #89927. 2023-04-03 11:26:01 +08:00
刘刚 daf117c154 Merge branch 'daitingting_revert_version' into 'master'
* Revert version.

See merge request easycorp/zentaopms!7288
2023-04-03 03:12:21 +00:00
guofeilong 2192d98ea8 * Adjust code . 2023-04-03 11:09:03 +08:00
guofeilong 19c0741b15 * Adjust code . 2023-04-03 11:03:43 +08:00
caoyanyi 74f9b86ab8 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 10:55:01 +08:00
caoyanyi 38e85b8a9f * Code for task #89904. 2023-04-03 10:54:38 +08:00
guofeilong 22b4ceeb4f * Adjust code . 2023-04-03 10:53:08 +08:00
wangyidong e4ac679475 * code for task #89166. 2023-04-03 10:52:16 +08:00
daitingting 76a92d681e * Add from version list. 2023-04-03 10:47:45 +08:00
王怡栋 f5b0a2fb6a Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7290
2023-04-03 02:34:36 +00:00
tianshujie a44fe90fb6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 10:29:11 +08:00
guofeilong c948527232 * Adjust code . 2023-04-03 10:26:44 +08:00
daitingting de50c7f922 * Revert version. 2023-04-03 10:25:37 +08:00
王怡栋 683d497f70 Merge branch 'release/zentaopms_18.3' into 'master'
Handle upgrade SQL and upgrade programs.

See merge request easycorp/zentaopms!7287
2023-04-03 02:15:22 +00:00
guofeilong d83b533fe6 * Adjust code . 2023-04-03 10:14:03 +08:00
guofeilong 91c339cbef * Adjust code . 2023-04-03 10:08:24 +08:00
tianshujie fc1b8ea5b3 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 09:58:47 +08:00
guofeilong b815651077 * Adjust code . 2023-04-03 09:57:56 +08:00
tianshujie 57d515bd07 * Handle upgrade SQL and upgrade programs. 2023-04-03 09:57:45 +08:00
王怡栋 bf5c829e3d Merge branch 'sprint/304_liumengyi_89851' into 'master'
* Finish task #89851.

See merge request easycorp/zentaopms!7286
2023-04-03 01:45:23 +00:00
王怡栋 db1a0eaa3e Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7285
2023-04-03 01:42:28 +00:00
guofeilong fc8dde8886 * Adjust code . 2023-04-03 09:42:02 +08:00
liumengyi 295c53d6ee * Finish task #89851. 2023-04-03 09:22:02 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00