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-pile/src/main/java/com/jsowell/pile/vo/base/LoginUserDetailVO.java

@@ -0,0 +1,25 @@
+package com.jsowell.pile.vo.base;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 登录用户详情VO
+ */
+@Getter
+@Setter
+public class LoginUserDetailVO {
+    /**
+     * 有权限的一级运营商idList
+     * 平台级账号有多个一级运营商权限
+     * 其他账号只有一个
+     */
+    private List<String> firstMerchantIdList;
+
+    /**
+     * 获取当前会员中的运营商列表
+     */
+    private List<MerchantInfoVO> merchantInfoVOList;
+}

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java

@@ -20,6 +20,11 @@ public class MerchantInfoVO {
 	 */
 	private String merchantName;
 
+	/**
+	 * 运营商等级
+	 */
+	private String merchantLevel;
+
 	/**
 	 * 商户电话
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/UpdateMemberBalanceDTO.java

@@ -48,6 +48,11 @@ public class UpdateMemberBalanceDTO {
 	 */
 	private String relatedOrderCode;
 
+	/**
+	 * 充值目标运营商id
+	 */
+	private String targetMerchantId;
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)