Merge branch 'main' of http://gitea.bugtc.com/zhouyanli/property-resident-side

# Conflicts:
#	property-uniapp-project/pageSubPack/payment-list/addHydropower.vue
#	property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue

property-uniapp-project/pageSubPack/payment-list/addPayment.vue

@@ -23,7 +23,7 @@
  				<view class="info-card">
  					<view class="form-item" @click="goToChange()">
  						<text class="label">缴费单位</text>
- 						<text class="company-name">XXXXXXXX燃气有限公司</text>
+ 						<text class="company-name">XXXXXXXX有限公司</text>
  					</view>
 
  					<view class="form-item">