Commit Graph

1170 Commits

Author SHA1 Message Date
liuhong
0fa2de0ff8 *Finish task #63781. 2022-08-09 01:23:43 +00:00
zhouxudong
7a34334374 * Fix bug. 2022-08-04 05:50:24 +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
e95b8f75a3 * Finish task #62852. 2022-08-04 02:36:12 +00:00
zhouxudong
7054e33346 * Finish task #62852. 2022-08-04 02:30:31 +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
8bbac3b2fe * Finish task #62852. 2022-08-04 01:45:10 +00:00
liuruogu
5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00: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
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
王怡栋
d6ea8aea86 Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.

See merge request easycorp/zentaopms!4676
2022-07-28 00:52:40 +00:00
xieqiyu
e927796641 * Fix bug#25004. 2022-07-28 08:16:07 +08:00
xieqiyu
0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00
hufangzhou
9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +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
王怡栋
649950fa21 Merge branch 'sprint/master_zhouxudong_25672' into 'master'
* Fix bug #25672.

See merge request easycorp/zentaopms!4657
2022-07-26 07:14:19 +00:00
zhouxudong
b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +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
zenggang
c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
zenggang
dba57b45cd * Adjust code 2022-07-22 01:04:24 +00:00
zenggang
2c2141e055 * Fix bug#25591,25593 2022-07-21 09:04:46 +00:00
zenggang
0655809533 * Fix sprint217 bugs. 2022-07-21 04:06:11 +00:00
王怡栋
08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00: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
tianshujie
93f70dcf70 * Modify the jump link after saving the created program. 2022-07-20 17:25:25 +08: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
zhouxudong
ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
tianshujie
38325e32a8 * Fix bug #22964. 2022-07-13 09:05:36 +08:00
tianshujie
b68d6cca86 * Fix bug #23119. 2022-07-13 08:37:52 +08: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
王怡栋
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