Commit Graph

322 Commits

Author SHA1 Message Date
xieqiyu
d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
王怡栋
c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu
21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
tianshujie
226a7fc69b * Finish task #57893. 2022-06-21 16:37:35 +08:00
tianshujie
a6db8b4999 * Fix bug #24005. 2022-06-21 14:54:17 +08:00
tianshujie
42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
tianshujie
367f96a886 * Finish task #57894. 2022-06-21 13:47:08 +08:00
tianshujie
30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
tianshujie
837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
leiyong
32b846cdf5 * Finish task#56926. 2022-06-15 07:57:50 +00:00
王怡栋
6325ce1ccc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* recover user

See merge request easycorp/zentaopms!3872
2022-06-13 02:09:30 +00:00
lanzongjun
7c6b288878 * recover user 2022-06-10 17:26:57 +08:00
zenggang
8c5c2f2149 * Finish task#56549,56552 2022-06-10 00:51:11 +00:00
wangyidong
11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
lanzongjun
b31b45c11f * finish task #56023 2022-06-08 15:44:50 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明
61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明
cf5dbf0f23 * Remove unused code. 2022-06-02 14:53:51 +08:00
孙广明
23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
leiyong
71a4c1099d * Adjust the prompt text for plugin expiration. 2022-05-26 10:39:16 +00:00
leiyong
4744448fc5 * Adjust method name. 2022-05-26 07:43:52 +00:00
leiyong
ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +00:00
wangyidong
d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
孙广明
c4e649ef25 * Finish task #54186. 2022-05-17 09:35:32 +08:00
hufangzhou
401ea2f810 * Fix bug #22407. 2022-05-13 08:47:46 +08:00
xieqiyu
477a2a4162 * Fix bug#19318. 2022-04-15 13:57:35 +08:00
tanghucheng
b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +08:00
王怡栋
c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
王怡栋
f1f208db64 * fix bug #20669. 2022-03-11 14:06:04 +08:00
王怡栋
8053903ba2 * code for task #20556. 2022-03-11 10:03:48 +08:00
tanghucheng
dc394cd674 * Fix code format. 2022-03-10 15:31:50 +08:00
tanghucheng
31588aacc7 * Adjust for batchcreate user. 2022-03-10 15:23:40 +08:00
tanghucheng
76fd14c845 * Adjust for create user. 2022-03-10 12:09:33 +08:00
tanghucheng
2d3c8464d3 * Fix bug #20458,20369,20140,20373. 2022-03-09 10:20:46 +08:00
tianshujie
01d0a6b902 * Finish task #50311. 2022-03-07 11:32:10 +08:00
tianshujie
391d9cc18b * Fix bug #20090. 2022-03-02 10:02:27 +08:00
孙广明
f9ed1e1dd9 * Fix group bug. 2022-02-24 15:41:12 +08:00
Wenrui LI
2fdb1de490 * show only groups of current vision on user create, bug #18849. 2022-02-22 14:52:36 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
王怡栋
3082abe478 * adjust for set vision. 2022-02-18 08:36:54 +08:00
mayue
2cc103e46f * Fix bug #18308. 2022-02-07 11:10:43 +08:00
mayue
a2765b7427 * Optimize code. 2022-01-06 13:50:43 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
朱金勇
24ad4bc48c Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520

See merge request easycorp/zentaopms!1228
2021-12-31 07:53:33 +00:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
王怡栋
57c6ae78a8 * adjust for search. 2021-11-24 14:24:35 +08:00
xieqiyu
3e8e0dbcce * Fix bug#15457. 2021-10-16 15:32:13 +08:00
hufangzhou
3363c1adbf * Code for bug #15518. 2021-10-14 14:28:49 +08:00