Merge branch 'dev-lb' into 'dev'

feat

See merge request !229

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -1045,7 +1045,7 @@ public class RegionController extends BaseController {
     @RequestMapping(value = "/getThreeByUser", method = RequestMethod.GET)
     @ResponseBody
     public AjaxResult getThreeByUser(@RequestParam("wgType") String wgType,
-                                     @RequestParam("wgName") String wgName,
+                                     @RequestParam(value = "wgName", required = false) String wgName,
                                      @RequestParam("pageNum") Integer pageNum,
                                      @RequestParam("pageSize") Integer pageSize) {
         AjaxResult result = new AjaxResult();