Commit Graph
42490 Commits
Author SHA1 Message Date
zhouxudong 3cb2736d3b * Finish task #61909. 2022-07-26 01:39:05 +00:00
zhouxudong 9dd747147f * Finish task #61909. 2022-07-25 05:10:38 +00:00
zhouxudong 272aaed0a9 * Finish task #61909. 2022-07-25 03:17:42 +00:00
王怡栋 bf8a1c82d5 Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!4637
2022-07-22 08:02:13 +00:00
caoyanyi 9de38d0fe8 * Adjust code. 2022-07-22 15:59:40 +08:00
胡方舟 acc244f9ba Merge branch 'sprint/217_liumengyi_22507' into 'master'
* Fix bug #22507.

See merge request easycorp/zentaopms!4642
2022-07-22 07:51:48 +00:00
胡方舟 52a70a5781 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #24702.

See merge request easycorp/zentaopms!4641
2022-07-22 07:51:04 +00:00
liumengyi 714787d108 * Fix bug #22507. 2022-07-22 15:50:37 +08:00
tianshujie 737799378d * Fix bug #24702. 2022-07-22 15:49:22 +08:00
caoyanyi 37bb83338a * Modify merge resule update. 2022-07-22 15:29:42 +08:00
胡方舟 88c5134f25 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #24702.

See merge request easycorp/zentaopms!4640
2022-07-22 07:23:30 +00:00
胡方舟 6fcc801beb Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4639
2022-07-22 07:21:27 +00:00
caoyanyi 0277ee77d0 * Add tips for projects under the server. 2022-07-22 15:20:18 +08:00
tianshujie f1998ad485 * Fix bug #24702. 2022-07-22 15:18:27 +08:00
caoyanyi b61a3ab9ef * Optimize page. 2022-07-22 13:51:11 +08:00
孙广明 f95c3ee86f Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4638
2022-07-22 05:42:16 +00:00
liumengyi 8d9aace2de * Fix bug. 2022-07-22 13:42:08 +08:00
caoyanyi 94a3dea3f7 * Optimize pages. 2022-07-22 13:35:54 +08:00
caoyanyi c14a618dec * Optimize page. 2022-07-22 13:35:30 +08:00
tianshujie 3db9286074 * Fix bug #25398. 2022-07-22 13:28:02 +08:00
tianshujie 6904928898 * Fix bug #25389. 2022-07-22 13:25:09 +08:00
王怡栋 780dc7399c Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554.

See merge request easycorp/zentaopms!4636
2022-07-22 05:22:16 +00:00
liumengyi d83ed1092d * Fix bug #25554. 2022-07-22 13:17:18 +08:00
孙广明 22230645dd * Fix bug #25627. 2022-07-22 13:07:49 +08:00
tianshujie 29a889ddcf * Fix bug #24702. 2022-07-22 12:03:23 +08:00
wangyidong c820d66059 * fix bug #25557. 2022-07-22 11:37:12 +08:00
王怡栋 fc85ee539c Merge branch 'sprint/217_liumengyi_fixbug' into 'master'
* Fix bug #25554.

See merge request easycorp/zentaopms!4635
2022-07-22 03:20:59 +00:00
liumengyi 374ec6f55d * Fix bug #25554. 2022-07-22 11:06:51 +08:00
王怡栋 2be6c0bbcf Merge branch 'sprint/217_liumengyi_24181' into 'master'
* Fix bug #24181.

See merge request easycorp/zentaopms!4634
2022-07-22 03:02:45 +00:00
liumengyi ba22c27e28 * Fix bug #24181. 2022-07-22 10:35:37 +08:00
朱金勇 5ff47f2bd4 Merge branch 'sprint/scx_api' into 'master'
* Fix api bug.

See merge request easycorp/zentaopms!4628
2022-07-22 02:35:20 +00:00
tianshujie 5818db887f * Fix bug #25122. 2022-07-22 10:28:42 +08:00
孙广明 815c633bc7 * Code for my-index speed. 2022-07-22 10:26:59 +08:00
王怡栋 c7d2661141 Merge branch 'master_liuhong_25436' into 'master'
*Fox bug 25436

See merge request easycorp/zentaopms!4633
2022-07-22 02:25:15 +00:00
王怡栋 86169fa19c Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!4631
2022-07-22 02:24:46 +00:00
王怡栋 0420767f2f Merge branch 'sprint/217_25551' into 'master'
* Fix bug#25551,25591,25593

See merge request easycorp/zentaopms!4627
2022-07-22 02:20:54 +00:00
王怡栋 366a220180 Merge branch 'sprint/master_zhouxudong_61115' into 'master'
* Finish task #61115 #61114.

See merge request easycorp/zentaopms!4632
2022-07-22 02:14:07 +00:00
tianshujie 0976ce4cd5 * Fix bug #25567. 2022-07-22 10:09:27 +08:00
caoyanyi eba899076d * Modify merge param. 2022-07-22 10:05:29 +08:00
zenggang c368f63f6d * Adjust code 2022-07-22 02:01:47 +00:00
caoyanyi ce572304aa * Fix bug #25579. 2022-07-22 09:51:45 +08:00
liuhong 65aa0b2eee *Fox bug 25436 2022-07-22 01:49:45 +00:00
caoyanyi 935c713a2e * Modify commit param. 2022-07-22 09:31:55 +08:00
caoyanyi 272cef7585 * Fix bug #25583. 2022-07-22 09:28:20 +08:00
caoyanyi 5b73ba5f36 * Fix bug #25581. 2022-07-22 09:20:02 +08:00
caoyanyi aee9970d4a * Fix bug #25580. 2022-07-22 09:17:57 +08:00
zenggang dba57b45cd * Adjust code 2022-07-22 01:04:24 +00:00
王怡栋 71dd54df7a Merge branch 'master_liuhong_24666' into 'master'
Master liuhong 24666

See merge request easycorp/zentaopms!4624
2022-07-22 01:01:47 +00:00
王怡栋 95a0ac4315 Merge branch 'cyy_24558' into 'master'
* Fix bug #24558.

See merge request easycorp/zentaopms!4625
2022-07-22 01:01:13 +00:00
wangyidong 1e800bbb5c * fix bug #25600. 2022-07-22 08:53:27 +08:00