Merge remote-tracking branch 'origin/dev/one' into dev/one

# Conflicts:
#	diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -21,6 +21,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddProductsVO;
+import com.diagbot.vo.LantoneProductSelectVO;
 import com.diagbot.vo.OppendedProductVO;
 import com.diagbot.vo.UpdateProductVO;
 import com.google.common.collect.Lists;
@@ -205,12 +206,22 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     /**
      * 用户-分页查询产品信息
      *
-     * @param page 分页参数
-     * @param name 参数
+     * @param lantoneProductSelectVO 参数
      * @return 产品信息
      */
-    public RespDTO<IPage<LantoneProduct>> index(Page page, String name) {
-        IPage<LantoneProduct> res = this.selectProduct(page, name);
+    public RespDTO<IPage<LantoneProduct>> index(LantoneProductSelectVO lantoneProductSelectVO) {
+        Page page =new Page();
+        if(lantoneProductSelectVO.getSize()==0){
+            page.setSize(10l);
+        }else {
+            page.setSize(lantoneProductSelectVO.getSize());
+        }
+        if(lantoneProductSelectVO.getCurrent()==0){
+            page.setCurrent(1l);
+        }else {
+            page.setCurrent(lantoneProductSelectVO.getCurrent());
+        }
+        IPage<LantoneProduct> res = this.selectProduct(page, lantoneProductSelectVO.getName());
         return RespDTO.onSuc(res);
     }
 }

diagbotman-service/src/main/java/com/diagbot/vo/LantoneProductSelectVO.java

@@ -0,0 +1,28 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/28 16:49
+ */
+@Getter
+@Setter
+public class LantoneProductSelectVO{
+    /**
+     * 产品名称
+     */
+    private String name;
+
+    /**
+     * 每页显示的条数
+     */
+    private long size;
+
+    /**
+     * 页数
+     */
+    private long current;
+}

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -2,7 +2,6 @@ package com.diagbot.web;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
@@ -10,6 +9,7 @@ import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.vo.AddProductsVO;
+import com.diagbot.vo.LantoneProductSelectVO;
 import com.diagbot.vo.OppendedProductVO;
 import com.diagbot.vo.UpdateProductVO;
 import io.swagger.annotations.Api;
@@ -55,8 +55,8 @@ public class DiagLantoneProductController {
                     "根据每页显示条数，默认 10，和当前页<br>")
     @PostMapping("/selectProduct")
     @SysLogger("selectProduct")
-    public RespDTO<IPage<LantoneProduct>> selectProduct(Page page, String name) {
-        return lantoneProductFacade.index(page, name);
+    public RespDTO<IPage<LantoneProduct>> selectProduct(@RequestBody LantoneProductSelectVO lantoneProductSelectVO) {
+        return lantoneProductFacade.index(lantoneProductSelectVO);
     }
 
     @ApiOperation(value = "产品线管理——修改[by:wangyu]",