Merge branch 'bug修复' of sckj/mz-cloud into master

ruoyi-modules/mz-datasync/src/main/java/com/ruoyi/datasync/domain/DataSyncTable.java

@@ -1,6 +1,8 @@
 package com.ruoyi.datasync.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.ext.api.validate.group.AddGroup;
 import lombok.Data;
@@ -24,6 +26,7 @@ public class DataSyncTable extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
+    @TableId(value = "table_id",type = IdType.AUTO)
     private Long tableId;
 
     /** 表名称 */

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -1,5 +1,7 @@
 package com.ruoyi.gen.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
@@ -20,6 +22,7 @@ public class GenTable extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
+    @TableId(value = "table_id",type = IdType.AUTO)
     private Long tableId;
 
     /** 表名称 */

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -1,5 +1,7 @@
 package com.ruoyi.gen.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.ext.api.validate.group.AddGroup;
@@ -16,6 +18,7 @@ public class GenTableColumn extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 编号 */
+    @TableId(value = "column_id",type = IdType.AUTO)
     private Long columnId;
 
     /** 归属表编号 */

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java

@@ -1,5 +1,7 @@
 package com.ruoyi.job.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
@@ -35,6 +37,7 @@ public class SysJob extends BaseEntity
 
     /** 任务ID */
     @Excel(name = "任务序号", cellType = ColumnType.NUMERIC)
+    @TableId(value = "job_id",type = IdType.AUTO)
     private Long jobId;
 
     /** 任务名称 */

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java

@@ -1,5 +1,7 @@
 package com.ruoyi.job.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -24,6 +26,7 @@ public class SysJobLog
 
     /** ID */
     @Excel(name = "日志序号")
+    @TableId(value = "job_log_id",type = IdType.AUTO)
     private Long jobLogId;
 
     /** 任务名称 */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -49,7 +49,6 @@ public class SysMenuServiceImpl implements ISysMenuService
     public List<SysMenu> selectMenuList(Long userId)
     {
         SysMenu menu = new SysMenu();
-        menu.setStatus("0");
         return selectMenuList(menu, userId);
     }