Commit Graph

468 Commits

Author SHA1 Message Date
xieqiyu
c07f0dbdab * Finish task#54463. 2022-05-20 12:37:26 +08:00
liumengyi
5bdc188491 * Code format for bug #22585. 2022-05-18 10:12:42 +08:00
liumengyi
b4a34e2ed6 * Fix bug #22585. 2022-05-18 10:10:06 +08:00
liumengyi
bff314e0d4 * Modify code for task #54354. 2022-05-17 17:26:17 +08:00
wangyuting2
d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
王怡栋
d9d331c38e Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
#   framework/control.class.php
2022-05-10 08:46:32 +00:00
wangyuting2
fe3c882c5e * Adjust buildin workflow menu. 2022-05-10 16:32:04 +08:00
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting
e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting
96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
李玉春
06a38f17e3 Merge branch 'sprint/renying_Fixbug#21999' into 'master'
Sprint/renying fixbug#21999

See merge request easycorp/zentaopms!3215
2022-04-29 05:34:30 +00:00
renying
d17854d07d Fixbug#21999 2022-04-29 05:11:53 +00:00
renying
a2430ed507 Fixbug#21999 2022-04-29 03:13:32 +00:00
renying
e06c2e8666 Fixbug#21999 2022-04-29 03:10:49 +00:00
renying
6a5e9b8657 Fixbug#21999 2022-04-29 02:50:51 +00:00
liyuchun
537c1bea2d * Fix bug #15039. 2022-04-28 02:06:10 +00:00
wangyidong
0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
tianshujie
edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
liyuchun
13d354ba8c * Fix bug #21518. 2022-04-18 11:35:36 +08:00
tianshujie
5fa9f0d1a9 * Fix bug #21717. 2022-04-14 15:48:09 +08:00
tianshujie
04dc939bda Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug17280 2022-04-13 09:15:30 +08:00
xieqiyu
41b48ac200 * Fix bug of create test case. 2022-04-13 09:13:50 +08:00
tianshujie
b0e5f808c4 * Modify the default value of a function. 2022-04-12 15:13:15 +08:00
tianshujie
a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
xieqiyu
c7894fdb78 * Fix bug#15697. 2022-04-11 16:07:45 +08:00
mayue
2cdf6f1e98 * Fix bug #21616. 2022-04-11 09:44:40 +08:00
mayue
512a7dcf78 * Fix bug #21616. 2022-04-11 09:29:24 +08:00
mayue
327ff13564 * Fix bug #21616. 2022-04-11 09:07:38 +08:00
mayue
a9c203b866 * Fix bug #21616. 2022-04-11 08:38:13 +08:00
liumengyi
8b2a7bee76 * Add auto test of testcase and fix bug. 2022-04-08 15:44:22 +08:00
zhouxin
9400811bae * Adjust code. 2022-04-07 02:40:23 +00:00
zhouxin
67f18ddd69 * Fix bug #20718. 2022-04-07 01:44:12 +00:00
zhouxudong
995c88a678 * Fix bug #20112. 2022-03-18 11:57:22 +08:00
mayue
e303b1c45b * Fix bug #15289. 2022-03-17 15:47:16 +08:00
zhouxin
68650f4830 Finish task 49318. 2022-03-04 06:16:41 +00:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
songchenxuan
95d51fdc09 *Finish task #45337. 2021-12-07 15:46:13 +08:00
hufangzhou
e76a988bbe * Fix bug #17065. 2021-12-03 13:25:51 +08:00
tianshujie
92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +08:00
李玉春
4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
mayue
a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
songchenxuan
5d6909d347 * Finish task #45050. 2021-11-26 15:20:05 +08:00
songchenxuan
bc13a23d1e * Finish task #45050. 2021-11-26 14:58:39 +08:00
王怡栋
1ac64ab4c1 * code for task #44939. 2021-11-26 11:26:27 +08:00
王怡栋
9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
xieqiyu
15867e4fd3 * Fix bug#16638. 2021-11-23 19:05:34 +08:00