Commit Graph

500 Commits

Author SHA1 Message Date
王怡栋
a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
liuruogu
5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00:00
zhouxudong
2358f42e39 * Finish task #62836 ~ #62849. 2022-08-01 08:13:05 +00:00
zenggang
dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
xieqiyu
0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
xieqiyu
cd8247954c * Fix bug#25004. 2022-07-27 13:31:48 +08:00
zhouxudong
3e842a6316 * Fix bug #25696. 2022-07-26 08:53:24 +00:00
tianshujie
21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie
96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
王怡栋
c0d3c1da7f Merge branch 'sprint/217_zg_61182' into 'master'
* Finish task#61182,61168

See merge request easycorp/zentaopms!4615
2022-07-20 09:29:07 +00:00
zenggang
5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
tianshujie
68eecb775e * Fix bug #25483. 2022-07-20 16:07:50 +08:00
tianshujie
c4ab5588af * Fix bug #25483. 2022-07-20 15:59:50 +08:00
王怡栋
e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
2022-06-30 01:28:55 +00:00
zhouxudong
298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong
461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
tianshujie
105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
zhouxudong
eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong
446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
tianshujie
b438c9882a * Fix bug #23855. 2022-06-16 16:31:01 +08:00
tianshujie
d9731bb06c * Fix bug #23855. 2022-06-16 16:12:37 +08:00
tianshujie
641c13383b * Fix bug #23855. 2022-06-16 16:06:55 +08:00
tianshujie
61d8ccda45 * Fix bug #23855. 2022-06-16 15:37:59 +08:00
xieqiyu
770f4f978d * Fix bug of program list in normal user. 2022-06-15 10:03:14 +08:00
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