dev1.0pull到authlogin解决冲突

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java

@@ -157,13 +157,27 @@ public class DemoController {
         return demoService.saveCustomerInfo(dto);
     }
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
     @GetMapping("/getcustomergrid/{id}")
-    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id){
+    public Result<CustomerGridDTO> getcustomergrid(@PathVariable("id") String id) {
         return demoService.getcustomergrid(id);
     }
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
     @GetMapping("getSysUserInfoById")
-    public Result<UserDetail> getSysUserInfoById(@RequestParam("id") Long id){
+    public Result<UserDetail> getSysUserInfoById(@RequestParam("id") Long id) {
         return demoService.getSysUserInfoById(id);
     }
 }

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/DemoService.java

@@ -136,9 +136,22 @@ public interface DemoService extends BaseService<DemoEntity> {
      * @Date 2020/3/18 9:51
      **/
     Result<String> saveCustomerInfo(SaveCustomerFormDTO dto);
-    Result saveCustomerInfo(SaveCustomerFormDTO dto);
 
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.CustomerGridDTO>
+     * @Author yinzuomei
+     * @Description 测试demo-gov get入参@PathVariable
+     * @Date 2020/3/20 9:37
+     **/
     Result<CustomerGridDTO> getcustomergrid(String id);
 
-	Result<UserDetail> getSysUserInfoById(Long id);
+    /**
+     * @param id
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.commons.tools.security.user.UserDetail>
+     * @Author yinzuomei
+     * @Description 测试demo-admin get入参@RequestParam
+     * @Date 2020/3/20 9:37
+     **/
+    Result<UserDetail> getSysUserInfoById(Long id);
 }