Commit Graph
24146 Commits
Author SHA1 Message Date
wangyidong db477bbf3e * fix bug #12179. 2021-04-16 14:48:23 +08:00
wangyidong f4d3ad864b * adjust for upgrade. 2021-04-16 13:16:04 +08:00
qiyu-xie 7d52b3717f * Fix bug#12087. 2021-04-16 11:43:43 +08:00
hufangzhou 14a7078ff6 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 11:22:49 +08:00
hufangzhou bd9fb4c1d2 * Fix bug #12163. 2021-04-16 11:22:44 +08:00
tianshujie98 0bce567eac Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 11:08:42 +08:00
tianshujie98 d54cc94694 * Fix error. 2021-04-16 11:08:30 +08:00
holan20180123 ac2ffeeeb9 * Fix bug #12119. 2021-04-16 11:01:41 +08:00
wangyidong b7bd0e7103 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 10:41:02 +08:00
wangyidong 558e30790b * add standard sql. 2021-04-16 10:40:46 +08:00
leiyong 6c2132567b * Finish task#37522 2021-04-16 02:39:21 +00:00
wangyidong b386033870 * fix bug #12142. 2021-04-16 10:22:27 +08:00
wangyidong 2ffffa9b8e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 10:17:25 +08:00
wangyidong 23ceba780d * fix bug #12139. 2021-04-16 10:16:26 +08:00
Guanxiying 3457aa83c4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 10:07:38 +08:00
Guanxiying c304d9515a * Fix bug 12052. 2021-04-16 10:07:19 +08:00
holan20180123 26dc024e5a * Fix bug #12079. 2021-04-16 09:08:44 +08:00
zhujinyong 45246578c0 * Fix style of avatar menu. 2021-04-15 23:03:17 +08:00
zhujinyong ec60337667 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 22:53:00 +08:00
zhujinyong 082d15eef3 * Fix divider before first item in menu. 2021-04-15 22:52:40 +08:00
qiyu-xie 0daf41d179 * Finish task#37554. 2021-04-15 16:53:01 +08:00
hufangzhou ac1dd08476 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 16:43:51 +08:00
hufangzhou 8bdad21525 * Fix bug #12093. 2021-04-15 16:43:46 +08:00
Yagami cf7c1dc400 * Fix menu. 2021-04-15 16:43:27 +08:00
Yagami 8498428ca3 * Fix menu. 2021-04-15 16:43:27 +08:00
hufangzhou 2db8513fbb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 16:32:28 +08:00
hufangzhou d76368e265 * Adjust the nav hight light of maintainrelation page. 2021-04-15 16:32:24 +08:00
tianshujie98 60ea4c3705 * Adjust code. 2021-04-15 16:24:23 +08:00
Yagami 9ce2232cbf * Add change flow. 2021-04-15 16:09:58 +08:00
tianshujie98 b942a675b8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 16:02:22 +08:00
tianshujie98 4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
holan20180123 205f3748cb * Finish task #37500. 2021-04-15 15:49:56 +08:00
holan20180123 4a2a72ac45 * Finish task #37555. 2021-04-15 15:37:04 +08:00
qiyu-xie c769414efd * Fix a bug. 2021-04-15 15:25:28 +08:00
hufangzhou caf8b0e7a0 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 15:09:55 +08:00
hufangzhou 00f3c47bb5 * Fix bug #12120. 2021-04-15 15:09:50 +08:00
tianshujie98 160a359b13 * Finish task #37552. 2021-04-15 15:09:37 +08:00
tianshujie98 e42fa28ad7 * Finish task #37531. 2021-04-15 15:08:10 +08:00
wangyidong ac24179dc1 * fix bug. 2021-04-15 15:03:16 +08:00
wangyidong 2ea93b6e47 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:54:49 +08:00
wangyidong 81cbb2fd67 * fix bug #12061. 2021-04-15 14:54:26 +08:00
qiyu-xie eaa1460654 * Modify the name of the tr. 2021-04-15 14:53:38 +08:00
Yagami 1bf545170d * Fix user menu highlight. 2021-04-15 14:53:29 +08:00
holan20180123 57450ee56e * Finish task #37526. 2021-04-15 14:51:10 +08:00
tianshujie98 1162c7a8a2 * Rename. 2021-04-15 14:47:24 +08:00
wangyidong 1e1c5e0f43 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:46:05 +08:00
wangyidong 04a5041611 * fix bug #12059. 2021-04-15 14:45:35 +08:00
tianshujie98 3162efb035 * Finish task #37535. 2021-04-15 14:44:46 +08:00
hufangzhou 035efe6bd4 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:38:55 +08:00
hufangzhou e5a1820b05 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 14:38:44 +08:00