Merge branch 'main' of https://gitee.com/people_3/hmy_farmer

xuxy

2024-07-21 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2

 common/global.scss

@@ -77,6 +77,7 @@
   margin: 0 auto;
   margin-top: 160rpx;
   height: calc(100vh - 300rpx);
   overflow-y: scroll;
   background-color: #fff;
   border-radius: 40rpx 40rpx 0rpx 0rpx;
   padding: 26rpx;