Commit Graph
32185 Commits
Author SHA1 Message Date
tianshujie 56d8a1ad05 * Fix bug #21641. 2022-04-12 14:17:20 +08:00
mayue cedd0270e2 * Optimize code. 2022-04-12 14:14:32 +08:00
tianshujie 7f117b9a44 * Fix bug #18781. 2022-04-12 14:12:32 +08:00
mayue 3f9feedfe7 * Fix bug #18065. 2022-04-12 14:12:03 +08:00
王怡栋 393f0d61a5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18722

See merge request easycorp/zentaopms!2881
2022-04-12 06:06:04 +00:00
王怡栋 c6f7312b2e Merge branch 'sprint/fixbug_hufangzhou_14551' into 'master'
* Fix bug #14551.

See merge request easycorp/zentaopms!2878
2022-04-12 06:02:27 +00:00
王怡栋 89df957e9c Merge branch 'sprint/fixbug_hufangzhou_15641' into 'master'
* Fix bug #15641.

See merge request easycorp/zentaopms!2876
2022-04-12 06:01:51 +00:00
王怡栋 0e2e23f98a Merge branch 'sprint/fixbug_hufangzhou_15648' into 'master'
* Fix bug #15648.

See merge request easycorp/zentaopms!2875
2022-04-12 06:00:50 +00:00
王怡栋 a8c1b34b8e Merge branch 'sprint/fixbug_hufangzhou_15633' into 'master'
* Fix bug #15633.

See merge request easycorp/zentaopms!2874
2022-04-12 06:00:11 +00:00
xieqiyu 45b48305b7 * Fix bug#21385. 2022-04-12 13:28:32 +08:00
xieqiyu f1aad53d14 * Fix bug#13127. 2022-04-12 13:20:26 +08:00
tianshujie a8b051c12b * Fix bug #16527. 2022-04-12 12:58:56 +08:00
孙华伟 80a565aa47 *Optimize the code. 2022-04-12 11:17:20 +08:00
zenggang 654da8565f * Fix bug#21649,21512 2022-04-12 03:15:39 +00:00
Zongjun Lan 4184435c38 * fix bug *18722 2022-04-12 11:00:08 +08:00
Zongjun Lan 8ef47e9292 * fix bug *18722 2022-04-12 10:58:35 +08:00
mayue 8730491de8 * Fix bug#17864. 2022-04-12 10:54:21 +08:00
孙华伟 6e4153cdb9 *Optimize the code. 2022-04-12 10:44:49 +08:00
孙华伟 92a01376bb *Fix bug#21488. 2022-04-12 10:42:45 +08:00
hufangzhou d3fe628bcd * Fix bug #14551. 2022-04-12 10:37:41 +08:00
zhouxin 105874959c * Fix bug #21636. 2022-04-12 02:26:19 +00:00
李玉春 8772488231 Merge branch 'cyy_11026' into 'master'
* Fix bug #11026.

See merge request easycorp/zentaopms!2851
2022-04-12 02:13:53 +00:00
hufangzhou 96eae06795 * Fix bug #15641. 2022-04-12 10:11:20 +08:00
hufangzhou 2031d9df86 * Fix bug #15648. 2022-04-12 10:04:08 +08:00
zhengrunyu 7d3a91ab39 * Change function name for getBudgetWithUnit. 2022-04-12 09:53:30 +08:00
hufangzhou baf4a67ed8 * Fix bug #15633. 2022-04-12 09:51:09 +08:00
孙广明 a3858d1512 Merge branch 'master_xieqiyu_14595' into 'master'
* Fix bug#14595.

See merge request easycorp/zentaopms!2871
2022-04-12 01:41:18 +00:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master'
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
2022-04-12 01:40:59 +00:00
zhouxin 1571548411 * Fix bug #21654. 2022-04-12 01:34:40 +00:00
zhengrunyu fba6ac6a0e * Conversion budget unit. 2022-04-12 08:56:26 +08:00
sunjun c36f432e1a *Fixbug_sunjun_21618 2022-04-12 08:35:31 +08:00
李玉春 bf520a0fce Merge branch 'devops25_52069' into 'master'
Fix bug#21331

See merge request easycorp/zentaopms!2867
2022-04-12 00:16:02 +00:00
xieqiyu 68097e7725 * Fix bug#14595. 2022-04-11 17:36:44 +08:00
孙广明 46d3ac142f Merge branch 'fixbugs_zhouxin_17354' into 'master'
* Fix bug #17354.

See merge request easycorp/zentaopms!2870
2022-04-11 09:25:29 +00:00
孙广明 6ea181d050 Merge branch 'fixbugs_zhouxin_21320' into 'master'
* Fix bug #21320.

See merge request easycorp/zentaopms!2839
2022-04-11 09:25:00 +00:00
孙广明 bccf6e5248 Merge branch 'master_xieqiyu_18080' into 'master'
* Fix bug#18080.

See merge request easycorp/zentaopms!2837
2022-04-11 09:24:46 +00:00
xieqiyu a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
孙广明 4a1d446587 Merge branch 'fixbug_sunjun_21521' into 'master'
*Fixbug_sunjun_21521

See merge request easycorp/zentaopms!2856
2022-04-11 09:23:14 +00:00
孙广明 1eb763eb04 Merge branch 'master_xieqiyu_19197' into 'master'
* Fix bug#19197.

See merge request easycorp/zentaopms!2868
2022-04-11 09:22:54 +00:00
孙广明 39fd0e4700 Merge branch 'master_xieqiyu_15697' into 'master'
* Fix bug#15697.

See merge request easycorp/zentaopms!2864
2022-04-11 09:22:36 +00:00
孙广明 c7dc63ff11 Merge branch 'master_xieqiyu_18072' into 'master'
* Fix bug#18072.

See merge request easycorp/zentaopms!2852
2022-04-11 09:21:34 +00:00
zenggang 07573e3e8f * Adjust code 2022-04-11 09:05:29 +00:00
zhouxin c6b4f06bf4 * Fix bug #17354. 2022-04-11 08:54:22 +00:00
zenggang 2ce98e4622 * Fix bug#21331 2022-04-11 08:41:13 +00:00
王怡栋 b56588d33e Merge branch 'sprint/fixbug_hufangzhou_21646' into 'master'
* Fix bug #21646.

See merge request easycorp/zentaopms!2865
2022-04-11 08:24:00 +00:00
王怡栋 a41d152809 Merge branch 'sunhuawei_hideDefaultBranch' into 'master'
*Hide change default branch feature.

See merge request easycorp/zentaopms!2866
2022-04-11 08:23:11 +00:00
hufangzhou 5745d42b1f * Fix bug #21646. 2022-04-11 16:10:32 +08:00
xieqiyu c7894fdb78 * Fix bug#15697. 2022-04-11 16:07:45 +08:00
王怡栋 6f87b3858c Merge branch 'sprint/fixbug_hufangzhou_19789' into 'master'
* Fix bug #19789.

See merge request easycorp/zentaopms!2858
2022-04-11 08:03:37 +00:00
王怡栋 7703a83278 Merge branch 'mayue_fix_bug#17286' into 'master'
* Fix bug #17286.

See merge request easycorp/zentaopms!2860
2022-04-11 08:02:55 +00:00