Commit Graph
35321 Commits
Author SHA1 Message Date
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
王怡栋 b6869b0602 Merge branch 'sgm_block' into 'master'
Sgm block

See merge request easycorp/zentaopms!4772
2022-08-04 01:01:35 +00:00
liuruogu 5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00:00
sunguangming 9d1ce4c9d5 * Code for project export program name. 2022-08-04 08:39:15 +08:00
胡方舟 4c52cdadb3 Merge branch 'sprint/221_dongli_bug25837' into 'master'
* Fix bug #25837.

See merge request easycorp/zentaopms!4770
2022-08-03 09:41:09 +00:00
dongli 8b74ed5ddc * Fix bug #25837. 2022-08-03 09:38:21 +00:00
dongli 4f1492221a * Fix bug #25837. 2022-08-03 09:26:18 +00:00
王怡栋 60feb4cb34 Merge branch 'sprint/221_liumengyi_25994' into 'master'
* Fix bug #25994.

See merge request easycorp/zentaopms!4769
2022-08-03 09:17:57 +00:00
liumengyi 1fe596b022 * Fix bug #25994. 2022-08-03 17:17:16 +08:00
王怡栋 21e2ad2c96 Merge branch 'sprint/221_tianshujie_62936' into 'master'
* Finish task #62936.

See merge request easycorp/zentaopms!4768
2022-08-03 09:16:34 +00:00
王怡栋 54cd872f2a Merge branch 'sprint/221_liumengyi_25988' into 'master'
* Fix bug #25988.

See merge request easycorp/zentaopms!4766
2022-08-03 09:16:15 +00:00
tianshujie a09b7662d7 * Finish task #62936. 2022-08-03 17:15:49 +08:00
liumengyi 5acd4b9127 * Fix bug #25994. 2022-08-03 17:12:07 +08:00
tianshujie 175fd06bc2 * Finish task #62936. 2022-08-03 17:07:23 +08:00
wangyuting2 5bc8123a58 * Add note. 2022-08-03 17:06:56 +08:00
liuruogu 653f238cac * Finish task #63386. 2022-08-03 09:05:13 +00:00
wangyuting2 afba28db68 * Add project execution approval menu. 2022-08-03 16:48:10 +08:00
liumengyi 7584e9523e * Fix bug #25988. 2022-08-03 16:46:03 +08:00
wangyuting2 0747b43672 * Add projectrelease approval menu. 2022-08-03 16:31:59 +08:00
zhouxin d55a19884c * Fix bug #25995. 2022-08-03 08:25:11 +00:00
liuruogu a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
liugang 2b7833e0f9 * Finish task #63385. 2022-08-03 16:16:26 +08:00
liugang d17ea74a91 * Finish task #63390. 2022-08-03 16:16:26 +08:00
liugang 0f3fe6e4a9 * Finish task #63390. 2022-08-03 16:16:26 +08:00
liugang af464df513 * Finish task #63391. 2022-08-03 16:16:26 +08:00
liumengyi 69eb942fa4 * Fix bug #25988. 2022-08-03 16:13:59 +08:00
wangyuting2 39e507111c * Finish task #63379. 2022-08-03 16:04:40 +08:00
王怡栋 b9ba15e223 Merge branch 'sprint/221_25897' into 'master'
* Fix bug#25897,22882

See merge request easycorp/zentaopms!4763
2022-08-03 07:52:50 +00:00
王怡栋 77e01714d2 Merge branch 'sprint/211_liumengyi_62958' into 'master'
* Finish task #62957, #62958.

See merge request easycorp/zentaopms!4760
2022-08-03 07:46:59 +00:00
liuruogu 37e55ee3c9 * Finish task #63392. 2022-08-03 07:31:11 +00:00
zenggang 3a9f4d8ada * Fix bug#25897,22882 2022-08-03 07:16:28 +00:00
李玉春 ed719f768f Merge branch 'sprint/221_tianshujie_62947' into 'master'
Sprint/221 tianshujie 62947

See merge request easycorp/zentaopms!4761
2022-08-03 06:52:24 +00:00
李玉春 e8e657e6bb Update model.php 2022-08-03 06:52:05 +00:00
tianshujie b4a394718f * Finish task #62947. 2022-08-03 14:49:42 +08:00
liuruogu feb04dd1cd * Finish task #63384. 2022-08-03 06:48:05 +00:00
liugang 1712298192 * Finish task #63383. 2022-08-03 14:37:01 +08:00
wangyuting2 731e5a4161 * Fix warring. 2022-08-03 14:35:54 +08:00
wangyuting2 f3cd8e7008 * Fix sortFeature bug. 2022-08-03 14:21:42 +08:00
tianshujie 6661f80c81 * Fix bug #25984. 2022-08-03 14:19:00 +08:00
liumengyi 2c108bcf16 * Fix bug #25987. 2022-08-03 14:06:17 +08:00
wangyuting2 4b65421dbe * Fix lang is not defind bug. 2022-08-03 13:47:05 +08:00
李玉春 d9d807c79d Merge branch 'sprint/221_liumengyi_25965' into 'master'
* Fix bug #25965.

See merge request easycorp/zentaopms!4756
2022-08-03 05:43:46 +00:00
李玉春 b7e845f6b5 Merge branch 'sprint/221_liumengyi_25964' into 'master'
* Fix bug #25964.

See merge request easycorp/zentaopms!4757
2022-08-03 05:43:20 +00:00
李玉春 9ec11b0fd8 Merge branch 'sprint/211_liumengyi_25978' into 'master'
* Fix bug #25978.

See merge request easycorp/zentaopms!4758
2022-08-03 05:42:30 +00:00
李玉春 0083ac3f07 Merge branch 'sprint/211_liumengyi_fixbug' into 'master'
* Fix bug #25968.

See merge request easycorp/zentaopms!4755
2022-08-03 05:42:19 +00:00
tianshujie 167c36d6d5 * Finish task #62947. 2022-08-03 13:41:05 +08:00
wangyuting2 84c6278274 * Finish task #63288. 2022-08-03 13:32:41 +08:00
wangyuting2 9461d0fc1d * Adjust release menu. 2022-08-03 13:32:41 +08:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00