Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/controller/LoginLogController.java

@@ -141,7 +141,7 @@ public class LoginLogController {
                 loginLogDto.setBeginTime(f.parse(beginTime));
             }
             if(StringUtils.isNotBlank(endTime)){
-                loginLogDto.setBeginTime(f.parse(endTime));
+                loginLogDto.setEndTime(f.parse(endTime));
             }
         }catch (ParseException e){
             log.error("登录日志查询时间转换错误，原数据：beginTime：{}，endTime：{}，异常信息：{}",beginTime,endTime,e.getMessage());

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -162,7 +162,7 @@
             menu_image,
             seq,
             LINK_PATH,
-            0,
+            1,
             now(),
             #{userName},
             now(),