Commit Graph

476 Commits

Author SHA1 Message Date
xieqiyu
6fdcc5f826 * Modify review code for bug#23185. 2022-06-01 23:34:48 +08:00
xieqiyu
b0bac9dfae * Fix bug#23185. 2022-06-01 23:21:22 +08:00
xieqiyu
6e6d83b814 * Fix bug#23185. 2022-06-01 21:36:15 +08:00
xieqiyu
1a24cdbc80 * Fix bug#23185. 2022-06-01 21:29:30 +08:00
王怡栋
f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
tanghucheng
f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
xieqiyu
95f202ade2 * Code for task#55628. 2022-05-31 01:37:02 +08:00
xieqiyu
833e82205c * Code for bug#23055. 2022-05-29 22:16:17 +08:00
wangyidong
967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyuting2
af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08:00
zenggang
8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
王怡栋
f27bae0fe6 Merge branch 'sprint/189_zg_bugs' into 'master'
* Fix bug#22451,22473,22475

See merge request easycorp/zentaopms!3390
2022-05-13 09:44:01 +00:00
zenggang
cc7f860ac0 * Fix bug#22451,22473,22475 2022-05-13 04:11:12 +00:00
孙华伟
183da95a35 *Fix bug#22454 2022-05-13 11:07:54 +08:00
zenggang
94bf6a70a2 * Adjust code 2022-05-13 00:44:07 +00:00
zenggang
e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
孙华伟
3de0b23ab8 *Optimize the bug. 2022-05-12 13:26:19 +08:00
孙华伟
9c2926f59a *Optimize the code. 2022-05-12 13:23:11 +08:00
孙华伟
4f51081da0 *Fix bug#22367. 2022-05-12 11:03:36 +08:00
孙华伟
58cea27fc5 Update model.php 2022-05-12 02:16:52 +00:00
孙华伟
a3149121ac Update model.php 2022-05-12 01:55:48 +00:00
孙华伟
b1c6976f2f *Fix bug #22365. 2022-05-12 09:54:55 +08:00
zenggang
0fe5a1884f * Adjust code 2022-05-11 09:11:13 +00:00
zenggang
2bc6e6b468 * Adjust code 2022-05-11 09:08:18 +00:00
zenggang
b5093f3a1b * Code for task#53657 2022-05-11 08:32:50 +00:00
zenggang
ea968e917c * Adjust code 2022-05-11 06:11:55 +00:00
zenggang
d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00: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
tianshujie
b9670165ab * Fix bug #21653. 2022-04-13 14:44:01 +08:00
tianshujie
e681135a3a * Fix bug #21643. 2022-04-13 14:22:32 +08:00
Zongjun Lan
8ef47e9292 * fix bug *18722 2022-04-12 10:58:35 +08:00
Zongjun Lan
f61cdef8d0 * fix bug #21424 2022-04-02 10:56:10 +08:00
Zongjun Lan
0ad0b1938c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-01 15:32:11 +08:00
Zongjun Lan
06f066f45d * fix bug #18722 2022-04-01 14:15:11 +08:00
zenggang
40f9a85a6f * Fix bug#21097,21096 2022-03-31 01:35:50 +00:00
zhouxin
6bc82e81c1 * Fix bug #14512. 2022-03-28 09:19:14 +00:00
zhouxin
25338e33f5 * Fix bug #14512. 2022-03-28 07:23:53 +00:00
mayue
71d64d8e65 * Handling PHP compatibility issues. 2022-03-25 11:05:18 +08:00
孙广明
02e91b8ac5 * Fix program whitelist bug. 2022-03-25 10:27:56 +08:00
tianshujie
9b7d8686c7 * Modify the judgment logic. 2022-03-24 09:42:08 +08:00
tianshujie
e9ee8a176d * Fix bug #19072. 2022-03-24 09:35:39 +08:00
xieqiyu
23a898218d * Fix bug#20850. 2022-03-16 16:28:32 +08:00
tianshujie
3246d38e73 * Fix bug #20300. 2022-03-03 16:50:52 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng
966f00c07a * finish task #49421,49338. 2022-02-17 14:58:59 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhouxudong
31e2c020f7 *Finish task #48843. 2022-02-09 16:09:57 +08:00
tanghucheng
1f81f7cef8 * Fix projectlist. 2022-01-25 16:27:13 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00