Commit Graph
1203 Commits
Author SHA1 Message Date
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
mayue f15f8f0345 * Fix bug #22412. 2022-05-12 05:55:25 +00:00
mayue 53638cb9f2 * Fix bug. 2022-05-12 05:40:39 +00:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
孙华伟 6c2b318da4 *Optimize the code. 2022-05-12 13:21:44 +08:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
#   module/project/model.php
2022-05-12 05:01:42 +00:00
mayue e65e7568b2 * Optimize code. 2022-05-12 03:37:22 +00:00
mayue 5a2ef22f3b * Optimize code. 2022-05-12 03:17:00 +00:00
mayue 3a2c854159 * Optimize code. 2022-05-12 03:13:39 +00:00
mayue ac6e3ab491 * Optimize code. 2022-05-12 02:58:23 +00:00
mayue 46c555fb3f * Add max code. 2022-05-12 02:38:33 +00:00
孙华伟 99d5b60d56 Update model.php 2022-05-12 02:15:35 +00:00
孙华伟 2ad83c6631 *Fix bug #22365 2022-05-12 09:46:20 +08:00
孙广明 f42cdbe8e5 Merge branch 'sunhuawei_task_53659' into 'master'
*Finish task #53659.

See merge request easycorp/zentaopms!3336
2022-05-11 08:53:12 +00:00
孙华伟 43984d13b4 Update model.php 2022-05-11 08:45:54 +00:00
孙华伟 0aa36bd6e5 *Optimize the code. 2022-05-11 16:25:43 +08:00
孙华伟 ffed15713b *Optimize the code. 2022-05-11 16:15:54 +08:00
mayue bbb5ec189d * Optimize code. 2022-05-11 07:57:36 +00:00