Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,132 Commits 2 Branches 292 Tags
d11349b974da7a17d9f99ecffa114ddbf5c8f58d
Commit Graph
4047 Commits
Author SHA1 Message Date
zhouxin c5be32065d * Fix bug. 2022-05-18 07:50:26 +00:00
zhouxin 094db2e505 * Adjust code. 2022-05-18 07:39:05 +00:00
zhouxin 5ef4782e82 * Finish task #54351. 2022-05-18 07:31:45 +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
孙华伟 12b8250e06 *Fix bug #22453 #22455. 2022-05-13 13:17:10 +08:00
孙华伟 8ab8962a3f *Fix bug#22453 2022-05-13 11:16:52 +08: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
tianshujie 6770b72b11 * Fix bug #22437. 2022-05-13 08:42:26 +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
孙广明 f4724390f6 Merge branch 'sunhuawei_fixbug' into 'master' 
*解决功能演示过程中出现的问题。

See merge request easycorp/zentaopms!3365
 2022-05-12 07:36:01 +00:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +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
孙华伟 4f51081da0 *Fix bug#22367. 2022-05-12 11:03:36 +08:00
mayue ac6e3ab491 * Optimize code. 2022-05-12 02:58:23 +00:00
mayue 4460a50980 * Optimize code. 2022-05-12 02:50:13 +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
孙华伟 1251eda902 *Fix bug. 2022-05-12 08:35:59 +08:00
孙广明 8e53847096 Merge branch 'sunhuawei_task_53659' into 'master' 
*Fix bug.

See merge request easycorp/zentaopms!3342
 2022-05-11 09:11:46 +00:00
孙华伟 318ccfb4bc Update config.php 2022-05-11 09:03:10 +00:00
孙华伟 f65a51e5e1 *Fix bug. 2022-05-11 17:00:59 +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
孙华伟 d4050ef0ef Merge branch 'sunhuawei_task_53659' of https://gitlab.zcorp.cc/easycorp/zentaopms into sunhuawei_task_53659 2022-05-11 16:42:32 +08:00
孙华伟 ce6056ed07 *Optimize the code. 2022-05-11 16:40:48 +08:00
孙华伟 008236e997 Update zh-cn.php 2022-05-11 08:29:42 +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
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +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