Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: db9c485130cccc767ffdb035520f6a59a185986b
+  newTag: 8b6264c308beae36de6ac8a133d0d8d52497d6fc

src/pages/rentManage/rentGoods/rentAddOrEdit/components/addressInfo/index.tsx

@@ -198,7 +198,7 @@ const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
           <Select placeholder='请选择寄出物流' options={expressOptionList}></Select>
         </Form.Item>
         <Form.Item
-          label='配送方式（寄出）'
+          label='配送方式'
           name='modeOfDelivery'
           rules={[{ required: true, message: '请选择配送方式（寄出）' }]}
         >