Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,286 Commits 2 Branches 292 Tags
089eb573e1ff712600f4ce71bb2d4e19caaa888d
Commit Graph
1185 Commits
Author SHA1 Message Date
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
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
孙华伟 0695047d20 *Finish task #53659. 2022-05-11 15:40:59 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
mayue 98dcd7517f * Optimize code. 2022-05-11 06:38:46 +00:00
mayue ca2fc749cd * Optimize code. 2022-05-11 05:40:31 +00:00
mayue d560f6d2ab * Finish task #53652. 2022-05-11 05:38:29 +00:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
孙广明 2db91483d3 Merge branch 'sprint/master_zhouxudong_22038' into 'master' 
* Fix bug #22038.

See merge request easycorp/zentaopms!3163
 2022-04-28 09:11:30 +00:00
zhouxudong d6d13aa14b * Fix bug #22038. 2022-04-28 08:12:11 +00:00
zhouxudong b6a70926ab * Fix bug #22038. 2022-04-28 08:09:57 +00:00
zhouxin 2178892254 * Fix bug #21929. 2022-04-28 05:56:51 +00:00
zhouxudong c89922b002 * Fix bug #22038. 2022-04-28 05:16:24 +00:00
zhouxudong e2aa928abe * Fix bug #22038. 2022-04-28 02:57:42 +00:00
zhouxin a470e1e83e * Fix bug #22044. 2022-04-28 01:29:42 +00:00
xieqiyu 3c4b41ea3a * Fix bug#22002. 2022-04-26 11:16:20 +08:00
Zongjun Lan cc17a999ec * fix code 2022-04-21 09:32:11 +08:00
Zongjun Lan a700b8994c * fix bug *19360 2022-04-20 14:22:55 +08:00
tianshujie c595eaa0d5 * Fix bug #21830. 2022-04-19 10:49:03 +08:00