Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/AreaQueryController.java

@@ -20,6 +20,7 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,7 +39,7 @@ public class AreaQueryController extends BaseApiController {
     /**
 	 * 分页获取
 	 */
-    @GetMapping("/area/listByPid")
+    @PostMapping("/area/listByPid")
     @ApiOperation(value="获取省市区信息", notes="根据省市区的pid获取地址信息")
     @ApiImplicitParam(name = "pid", value = "省市区的pid(pid为0获取所有省份)", required = true, dataType = "String")
 	public ResponseEntity<List<Area>> listByPid(Long pid){

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -54,6 +54,12 @@ public class Channel implements Serializable {
   @TableField("level")
   private Integer level;
 
+  /**
+   * 经销商类型，
+   */
+  @TableField("site_type")
+  private Integer siteType;
+
   /**
    * 分佣百分比
    */

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -9,6 +9,7 @@
         <result column="name" property="name" />
         <result column="parent_id" property="parentId" />
         <result column="level" property="level" />
+        <result column="site_type" property="siteType" />
         <result column="comm_rate" property="commRate" />
         <result column="province" property="province" />
         <result column="province_id" property="provinceId" />
@@ -33,7 +34,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        channel_id, channel_no, name, parent_id, level, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license, door_pic, memo, created_time, updated_time
+        channel_id, channel_no, name, parent_id, level, site_type, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license, door_pic, memo, created_time, updated_time
     </sql>
 
 </mapper>