Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-api/src/main/java/com/gic/store/utils/MoveType.java

+package com.gic.store.utils;
+
+/**
+ * @author zhiwj
+ * @date 2019/6/26
+ */
+public enum MoveType {
+
+    //    排序类型
+    MOVE_UP(1, "上移"),
+    MOVE_DOWN(2, "下移"),
+    TOPPING(3, "置顶"),
+    BOTTOM(4, "置底");
+    private Integer code;
+    private String description;
+
+    MoveType(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

gic-store-web/src/main/java/com/gic/store/web/controller/StoreRegionController.java

@@ -36,7 +36,7 @@ public class StoreRegionController {
     @RequestMapping("/page-store-region")
     public RestResponse pageStoreRegion(String search, PageQO pageQO) {
         Integer enterpriseId = 1111;
-        ServiceResponse<Page<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search, pageQO.getPageNum(), pageQO.getPageSize());
+        ServiceResponse<Page<StoreRegionDTO>> serviceResponse = storeRegionApiService.listStoreRegion(enterpriseId, search, pageQO.getCurrentPage(), pageQO.getPageSize());
         if (serviceResponse.isSuccess()) {
             return RestResponse.success(serviceResponse.getResult());
         } else {

gic-store-web/src/main/java/com/gic/store/web/qo/PageQO.java

@@ -13,19 +13,19 @@ public class PageQO implements Serializable {
     /**
      * 页码
      */
-    private Integer pageNum;
+    private Integer currentPage=1;
 
     /**
      * 分页大小
      */
-    private Integer pageSize;
+    private Integer pageSize=20;
 
-    public Integer getPageNum() {
-        return pageNum;
+    public Integer getCurrentPage() {
+        return currentPage;
     }
 
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
     }
 
     public Integer getPageSize() {