Commit Graph
519 Commits
Author SHA1 Message Date
王怡栋 e75b9b4b5f Merge branch 'sprint/228_tianshujie_api' into 'master'
* Get the execution list.

See merge request easycorp/zentaopms!5029
2022-08-19 05:13:29 +00:00
tianshujie b47cd1b77b * Fixed an issue where the admin could not click on the program. 2022-08-19 11:36:05 +08:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
zhouxudong 266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
xieqiyu 9c4f3f0ee1 * Code for task#62851. 2022-08-10 13:32:15 +08:00
zhouxudong 808d01aa17 * Finish task. 2022-08-09 09:43:34 +00:00
zhouxudong 6f8f9b52e9 * Finish task. 2022-08-09 07:31:10 +00:00
zhouxudong 90e0daf6c0 * Finish task. 2022-08-09 06:32:29 +00:00
liuhong bb856c1fce *Finish task #63781. 2022-08-09 02:32:04 +00:00
liuhong 0fa2de0ff8 *Finish task #63781. 2022-08-09 01:23:43 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong c68f271328 * Finish task 62581. 2022-08-07 13:55:38 +00:00
zhouxudong 0091ac82c6 * Update. 2022-08-05 08:16:11 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong f3c4e8b26b * Finish task #62852. 2022-08-04 02:24:51 +00:00
zhouxudong 0c29e89833 * Finish task #62852. 2022-08-04 02:16:56 +00:00
wangyuting2 c4f99aeced * Fix program featureMenu bug. 2022-08-04 09:52:05 +08:00
zhouxudong 584793163f * Finish task #62852. 2022-08-03 07:31:07 +00:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong b139f8da68 * Finish task #62852. 2022-08-03 01:34:09 +00:00
zhouxudong 535922b47c * Finish task #62852. 2022-08-02 09:36:54 +00:00
zhouxudong 69dd615244 * Finish task #62852. 2022-08-02 08:39:29 +00:00
zhouxudong 03d68d05ff * Finish task #62852. 2022-08-02 06:10:13 +00:00
zhouxudong 72b6dd9af0 * Finish task #62852. 2022-08-02 06:05:20 +00:00
zhouxudong 8486aba922 * Finish task #62852. 2022-08-02 05:51:49 +00:00
xieqiyu e927796641 * Fix bug#25004. 2022-07-28 08:16:07 +08:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
tianshujie fe226c094b * Fix bug #24913. 2022-07-08 15:17:02 +08:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong bc16e41c73 * Fix bug #24472. 2022-06-30 02:44:29 +00:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong 463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
王怡栋 4dab93ee3b Merge branch 'sprint/master_zhouxudong_57864' into 'master'
* Finish task #57864.

See merge request easycorp/zentaopms!4082
2022-06-23 00:40:27 +00:00
zhouxudong bc416e40fc * Finish task #57864. 2022-06-22 10:11:06 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
Hao Sun 72d4c854d3 * prevent user move row by click a link. 2022-06-17 07:39:03 +00:00
Hao Sun 775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
李玉春 088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master'
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
2022-05-19 07:53:10 +00:00
leiyong 4198e05c9e * Adjust code. 2022-05-19 06:53:37 +00:00