Commit Graph
1220 Commits
Author SHA1 Message Date
sunjun e5ed8133b1 sprint_59473 2022-07-06 01:06:35 +00:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
liumengyi 3d92afa1ae * Fix bug. 2022-06-30 11:20:41 +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 577ba86380 * Fix bug #24417. 2022-06-30 01:21:54 +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
王怡栋 4d95909d6e Merge branch 'sprint/208_liumengyi_58558' into 'master'
* Finish task #58558, #58559.

See merge request easycorp/zentaopms!4186
2022-06-28 06:22:42 +00:00
liumengyi 2379f0e4a4 * Finish task #58558, #58559. 2022-06-28 13:22:23 +08:00
王怡栋 1c45032e88 Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.

See merge request easycorp/zentaopms!4174
2022-06-28 03:28:15 +00:00
tianshujie 3a380aee1d * Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560. 2022-06-28 11:23:20 +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
孙广明 5f26b603e7 * Code for bug #24007. 2022-06-21 15:22:12 +08:00
tianshujie 65c9254f7c * Resolve issue #677. 2022-06-16 11:22:15 +08:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
mayue e11b76d819 * Ajust mutual test issue. 2022-06-10 10:23:27 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
xieqiyu 36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
孙广明 716c7ca6e6 Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182

See merge request easycorp/zentaopms!3703
2022-06-02 06:17:56 +00:00
sunjun 5b35fab5f6 fixbug_sunjun_23182 2022-06-02 01:43:24 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
唐胡成 0b68898f0a Update model.php 2022-06-01 00:43:27 +00:00
tanghucheng f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
liumengyi ad84595992 * Optimized code for task #55683. 2022-05-31 14:00:13 +08:00
liumengyi 1b89018e2f * Optimized code for task #55684, #55683. 2022-05-31 13:55:59 +08:00
liumengyi e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
mayue 33730f3787 * Fix bug #22880. 2022-05-25 01:56:04 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
wangyidong 55b68c8a57 * adjust for round error. 2022-05-20 15:23:02 +08:00
tianshujie 4ff0410aca * Fix bug #22617. 2022-05-20 10:45:48 +08:00
leiyong 143e9aff96 * Finish task#54488. 2022-05-19 09:32:47 +00:00
wangyidong 92e8a84230 * adjust for edit project. 2022-05-19 16:15:55 +08:00
zenggang 56363dbfeb * Adjust code 2022-05-17 08:52:33 +00:00
zenggang 5bb5dfce54 * Adjust code 2022-05-17 08:44:50 +00:00
zenggang aef54696ec * Adjust code 2022-05-17 08:21:49 +00:00
zenggang 8a06d71cfd * Finish task#54192,54196 2022-05-17 07:46:52 +00:00
孙广明 270715e54b Merge branch 'sprint_sunjun_631' into 'master'
Sprint sunjun 631

See merge request easycorp/zentaopms!3410
2022-05-17 01:15:01 +00:00
mayue 5f936b6274 * Optimize code. 2022-05-13 09:37:27 +00:00
mayue 025238c3d8 * Fix api bug. 2022-05-13 08:17:12 +00:00
sunjun 845c84a1eb *sprint_sunjun_631 2022-05-13 02:53:47 +00:00
mayue 2bbc219944 * Fix bug #22411. 2022-05-13 02:33:54 +00:00
hufangzhou 74bf099c98 * Fix bug #22443. 2022-05-13 09:02:56 +08:00
mayue 44783b57a5 * Optimize code. 2022-05-12 08:52:17 +00:00
mayue 96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00