Merge branch 'dev_local' into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

jsowell-ui/src/views/member/info/index.vue

@@ -207,7 +207,20 @@
         <el-dialog title="会员充值/扣款" @close="closeUpdateBalance" :visible.sync="openUpdateBalance" width="500px"
                    append-to-body>
             <p>线下充值本金，客户直接在线下付款给商家</p>
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                <el-form-item label="选择运营商">
+                    <el-select
+                        v-model="targetMerchantId"
+                        clearable placeholder="请选择运营商"
+                    >
+                        <el-option
+                            v-for="item in merchantList"
+                            :key="item.merchantName"
+                            :label="item.merchantName"
+                            :value="item.merchantId">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="操作类型">
                     <el-radio v-model="type" label="1" border>充值</el-radio>
                     <el-radio v-model="type" label="2" border>扣款</el-radio>
@@ -266,6 +279,7 @@ export default {
             updatePrincipalBalance: "", // 充值扣款金额
             updateBalanceMemberId: "", // 需要充值扣款的会员id
             type: '1', // 操作类型 1-充值；2-扣款
+            targetMerchantId: "", // 目标运营商id
             // 查询参数
             queryParams: {
                 pageNum: 1,
@@ -320,10 +334,10 @@ export default {
         },
         // 获取运营商列表
         getMerchantList() {
-            // getMerchantList().then((response) =>{
-            //   console.log("response", response)
-            //   this.merchantList = response.obj
-            // })
+            getMerchantList().then((response) =>{
+              console.log("response", response)
+              this.merchantList = response.obj
+            })
         },
         // 取消按钮
         cancel() {
@@ -414,7 +428,8 @@ export default {
                 memberId: this.updateBalanceMemberId,
                 updatePrincipalBalance: this.updatePrincipalBalance,
                 type: this.type,
-                subType: this.subType
+                subType: this.subType,
+                targetMerchantId: this.targetMerchantId
             };
             console.log("修改会员本金余额 param:", param);
             updateMemberBalance(param).then(response => {