Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-31 9b583c3ae9f78328368b2eda8899f80204ed796f

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -662,8 +662,8 @@
    * @return
    */
   @GetMapping("/seleL")
   public R seleL(String type,String deptid, String jurisdiction) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction);
   public R seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
      return R.data(list);
   }