Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mappers/StockMapper.xml

src/main/java/com/no1/wms/authority/AuthorityController.java

@@ -5,6 +5,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.util.UUID;
+
 @Controller
 public class AuthorityController {
     @Autowired
@@ -12,10 +14,11 @@ public class AuthorityController {
 
 
     @GetMapping("/test/tt")
-    public ModelAndView test(ModelAndView mav){
-        //AuthorityDto dto = authorityService.selectById("94690a18-a933-11ee-b9dd-0242ac110006");
+    public ModelAndView test(ModelAndView mav, AuthorityDto d){
+        d.setId("94690a18-a933-11ee-b9dd-0242ac110006");
+        AuthorityDto dto = authorityService.selectById(d);
 
-        //System.out.println(dto.getName());
+        System.out.println(dto.getName());
 
         mav.setViewName("test/testlayout");
         return mav;

src/main/java/com/no1/wms/authority/AuthorityDto.java

@@ -10,20 +10,21 @@ import java.util.UUID;
 @AllArgsConstructor
 @Alias("AuthorityDto")
 public class AuthorityDto {
-    private UUID id;
+    private String id;
     private String name;
-    private int account;
-    private int authority;
-    private int productCategory;
-    private int product;
-    private int prices;
-    private int vendor;
-    private int warehouse;
-    private int stock;
-    private int planIn;
-    private int productIn;
-    private int productOut;
-    private int board;
-    private boolean activation;
-    private boolean isGroupAuthority;
+    private Integer account;
+    private Integer authority;
+    private Integer productCategory;
+    private Integer product;
+    private Integer prices;
+    private Integer vendor;
+    private Integer warehouse;
+    private Integer stock;
+    private Integer planIn;
+    private Integer productIn;
+    private Integer productOut;
+    private Integer board;
+    private Boolean activation;
+    private Boolean isGroupAuthority;
+
 }

src/main/java/com/no1/wms/authority/AuthorityMapper.java

@@ -1,11 +1,12 @@
 package com.no1.wms.authority;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
 
 import java.util.UUID;
 
-
+@Repository
 @Mapper
 public interface AuthorityMapper {
-    AuthorityDto selectById(String id);
+    AuthorityDto selectById(AuthorityDto id);
 }

src/main/java/com/no1/wms/authority/AuthorityService.java

@@ -11,7 +11,7 @@ public class AuthorityService {
 
     @Autowired
     AuthorityMapper mapper;
-    public AuthorityDto selectById(String id){
-        return mapper.selectById(id);
+    public AuthorityDto selectById(AuthorityDto dto){
+        return mapper.selectById(dto);
     }
 }

src/main/java/com/no1/wms/base/WebConfig.java

@@ -1,6 +1,7 @@
 package com.no1.wms.base;
 
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

src/main/java/com/no1/wms/category/CategoryController.java

@@ -2,6 +2,8 @@ package com.no1.wms.category;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -16,7 +18,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.no1.wms.excel.ExcelUtils;
 
-import javax.servlet.http.HttpServletResponse;
 
 
 @Controller

src/main/java/com/no1/wms/excel/ExcelUtils.java

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -13,7 +15,8 @@ import org.springframework.stereotype.Service;
 
 import com.no1.wms.category.CategoryDto;
 
-import javax.servlet.http.HttpServletResponse;
+
+
 
 @Service
 public class ExcelUtils {