refactor(national-motion-module-system): 重构代码并优化数据库配置- 简化代码结构，替换 java.lang.String 为 String

- 更新数据库配置，使用 Asia/Shanghai时区
- 移除冗余代码和不必要的注释
- 统一异常处理，使用更具体的异常类型

national-motion-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java

@@ -25,6 +25,18 @@ package org.jeecg.common.constant;
  */
 public interface ServiceNameConstants {
 
+	/**
+	 * 微服务名：系统管理模块
+	 */
+	String SERVICE_SYSTEM = "jeecg-system";
+	/**
+	 * 微服务名： demo模块
+	 */
+	String SERVICE_DEMO = "jeecg-demo";
+	/**
+	 * 微服务名：joa模块
+	 */
+	String SERVICE_JOA = "jeecg-joa";
 	
 //	/**
 //	 * 微服务名：online在线模块

national-motion-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java

@@ -31,14 +31,14 @@ public class JeecgEntity implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "ID")
-    private java.lang.String id;
+    private String id;
 
     /**
      * 创建人
      */
     @Schema(description = "创建人")
     @Excel(name = "创建人", width = 15)
-    private java.lang.String createBy;
+    private String createBy;
 
     /**
      * 创建时间
@@ -54,7 +54,7 @@ public class JeecgEntity implements Serializable {
      */
     @Schema(description = "更新人")
     @Excel(name = "更新人", width = 15)
-    private java.lang.String updateBy;
+    private String updateBy;
 
     /**
      * 更新时间

national-motion-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java

@@ -23,23 +23,23 @@ public class DynamicDataSourceModel {
     /**
      * id
      */
-    private java.lang.String id;
+    private String id;
     /**
      * 数据源编码
      */
-    private java.lang.String code;
+    private String code;
     /**
      * 数据库类型
      */
-    private java.lang.String dbType;
+    private String dbType;
     /**
      * 驱动类
      */
-    private java.lang.String dbDriver;
+    private String dbDriver;
     /**
      * 数据源地址
      */
-    private java.lang.String dbUrl;
+    private String dbUrl;
 
 //    /**
 //     * 数据库名称
@@ -49,10 +49,10 @@ public class DynamicDataSourceModel {
     /**
      * 用户名
      */
-    private java.lang.String dbUsername;
+    private String dbUsername;
     /**
      * 密码
      */
-    private java.lang.String dbPassword;
+    private String dbPassword;
 
 }

national-motion-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java

@@ -10,13 +10,13 @@ import org.jeecgframework.poi.excel.annotation.Excel;
  */
 public class SysCategoryModel {
     /**主键*/
-    private java.lang.String id;
+    private String id;
     /**父级节点*/
-    private java.lang.String pid;
+    private String pid;
     /**类型名称*/
-    private java.lang.String name;
+    private String name;
     /**类型编码*/
-    private java.lang.String code;
+    private String code;
 
     public String getId() {
         return id;

national-motion-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -318,7 +318,7 @@ public class DateUtils extends PropertyEditorSupport {
         Date dt = new Date();
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String nowTime = df.format(dt);
-        java.sql.Timestamp buydate = java.sql.Timestamp.valueOf(nowTime);
+        Timestamp buydate = Timestamp.valueOf(nowTime);
         return buydate;
     }
 

national-motion-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java

@@ -25,7 +25,7 @@ public class MyClassLoader extends ClassLoader {
 	public static String getPackPath(Object object) {
 		// 检查用户传入的参数是否为空
 		if (object == null) {
-			throw new java.lang.IllegalArgumentException("参数不能为空！");
+			throw new IllegalArgumentException("参数不能为空！");
 		}
 		// 获得类的全名，包括包名
 		String clsName = object.getClass().getName();
@@ -35,7 +35,7 @@ public class MyClassLoader extends ClassLoader {
 	public static String getAppPath(Class cls) {
 		// 检查用户传入的参数是否为空
 		if (cls == null) {
-			throw new java.lang.IllegalArgumentException("参数不能为空！");
+			throw new IllegalArgumentException("参数不能为空！");
 		}
 		ClassLoader loader = cls.getClassLoader();
 		// 获得类的全名，包括包名
@@ -50,7 +50,7 @@ public class MyClassLoader extends ClassLoader {
 			String javaxSpot="javax.";
 			// 此处简单判定是否是Java基础类库，防止用户传入JDK内置的类库
 			if (packName.startsWith(javaSpot) || packName.startsWith(javaxSpot)) {
-				throw new java.lang.IllegalArgumentException("不要传送系统类！");
+				throw new IllegalArgumentException("不要传送系统类！");
 			}
 			// 在类的名称中，去掉包名的部分，获得类的文件名
 			clsName = clsName.substring(packName.length() + 1);

national-motion-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserAllTableManager.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.sqlparse;
+package org.jeecg.common.util.sqlparse;//package org.jeecg.common.util.sqlparse;
 //
 //import lombok.extern.slf4j.Slf4j;
 //import net.sf.jsqlparser.JSQLParserException;

national-motion-base-core/src/main/java/org/jeecg/common/util/sqlparse/JSqlParserUtils.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.sqlparse;
+package org.jeecg.common.util.sqlparse;//package org.jeecg.common.util.sqlparse;
 //
 //import lombok.extern.slf4j.Slf4j;
 //import net.sf.jsqlparser.JSQLParserException;

national-motion-base-core/src/main/java/org/jeecg/common/util/sqlparse/vo/SelectSqlInfo.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.sqlparse.vo;
+package org.jeecg.common.util.sqlparse.vo;//package org.jeecg.common.util.sqlparse.vo;
 //
 //import lombok.Data;
 //import net.sf.jsqlparser.statement.select.SelectBody;

national-motion-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.superSearch;
+package org.jeecg.common.util.superSearch;//package org.jeecg.common.util.superSearch;
 //
 //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 //

national-motion-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.superSearch;
+package org.jeecg.common.util.superSearch;//package org.jeecg.common.util.superSearch;
 //
 //import org.jeecg.common.util.oConvertUtils;
 //

national-motion-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java

@@ -1,4 +1,4 @@
-//package org.jeecg.common.util.superSearch;
+package org.jeecg.common.util.superSearch;//package org.jeecg.common.util.superSearch;
 //
 //import lombok.Data;
 //

national-motion-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java

@@ -22,7 +22,7 @@ public class AutoPoiConfig {
      */
     @Bean
     public ApplicationContextUtil applicationContextUtil() {
-        return new org.jeecgframework.core.util.ApplicationContextUtil();
+        return new ApplicationContextUtil();
     }
 
 }

national-motion-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java

@@ -1,4 +1,4 @@
-//package org.jeecg.config.mybatis;
+package org.jeecg.config.mybatis;//package org.jeecg.config.mybatis;
 //
 //import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 //import net.sf.jsqlparser.expression.BinaryExpression;

national-motion-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java

@@ -1,4 +1,4 @@
-//package org.jeecg.config.mybatis;
+package org.jeecg.config.mybatis;//package org.jeecg.config.mybatis;
 //
 //import lombok.extern.slf4j.Slf4j;
 //

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessage.java

@@ -25,23 +25,23 @@ import lombok.experimental.Accessors;
 public class SysMessage extends JeecgEntity {
 	/**推送内容*/
 	@Excel(name = "推送内容", width = 15)
-	private java.lang.String esContent;
+	private String esContent;
 	/**推送所需参数Json格式*/
 	@Excel(name = "推送所需参数Json格式", width = 15)
-	private java.lang.String esParam;
+	private String esParam;
 	/**接收人*/
 	@Excel(name = "接收人", width = 15)
-	private java.lang.String esReceiver;
+	private String esReceiver;
 	/**推送失败原因*/
 	@Excel(name = "推送失败原因", width = 15)
-	private java.lang.String esResult;
+	private String esResult;
 	/**发送次数*/
 	@Excel(name = "发送次数", width = 15)
-	private java.lang.Integer esSendNum;
+	private Integer esSendNum;
 	/**推送状态 0未推送 1推送成功 2推送失败*/
 	@Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15)
 	@Dict(dicCode = "msgSendStatus")
-	private java.lang.String esSendStatus;
+	private String esSendStatus;
 	/**推送时间*/
 	@Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -49,14 +49,14 @@ public class SysMessage extends JeecgEntity {
 	private java.util.Date esSendTime;
 	/**消息标题*/
 	@Excel(name = "消息标题", width = 15)
-	private java.lang.String esTitle;
+	private String esTitle;
 	/**
 	 * 推送方式：参考枚举类MessageTypeEnum
 	 */
 	@Excel(name = "推送方式", width = 15)
 	@Dict(dicCode = "messageType")
-	private java.lang.String esType;
+	private String esType;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
-	private java.lang.String remark;
+	private String remark;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java

@@ -22,19 +22,19 @@ import lombok.experimental.Accessors;
 public class SysMessageTemplate extends JeecgEntity{
 	/**模板CODE*/
 	@Excel(name = "模板CODE", width = 15)
-	private java.lang.String templateCode;
+	private String templateCode;
 	/**模板标题*/
 	@Excel(name = "模板标题", width = 30)
-	private java.lang.String templateName;
+	private String templateName;
 	/**模板内容*/
 	@Excel(name = "模板内容", width = 50)
-	private java.lang.String templateContent;
+	private String templateContent;
 	/**模板测试json*/
 	@Excel(name = "模板测试json", width = 15)
-	private java.lang.String templateTestJson;
+	private String templateTestJson;
 	/**模板类型*/
 	@Excel(name = "模板类型", width = 15)
-	private java.lang.String templateType;
+	private String templateType;
 
 	/**已经应用/未应用  1是0否*/
 	@Excel(name = "应用状态", width = 15)

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/monitor/actuator/httptrace/CustomHttpTraceEndpoint.java

@@ -29,7 +29,7 @@ public class CustomHttpTraceEndpoint{
 
     @ReadOperation
     public HttpTraceDescriptor traces(@Selector(match = ALL_REMAINING) String query) {
-        return new CustomHttpTraceEndpoint.HttpTraceDescriptor(this.repository.findAll(query));
+        return new HttpTraceDescriptor(this.repository.findAll(query));
     }
 
     @Getter

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java

@@ -1,4 +1,4 @@
-//package org.jeecg.modules.ngalain.aop;
+package org.jeecg.modules.ngalain.aop;//package org.jeecg.modules.ngalain.aop;
 //
 //import javax.servlet.http.HttpServletRequest;
 //

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java

@@ -1,4 +1,4 @@
-//package org.jeecg.modules.ngalain.controller;
+package org.jeecg.modules.ngalain.controller;//package org.jeecg.modules.ngalain.controller;
 //
 //import java.util.ArrayList;
 //import java.util.List;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/ngalain/service/NgAlainService.java

@@ -1,4 +1,4 @@
-//package org.jeecg.modules.ngalain.service;
+package org.jeecg.modules.ngalain.service;//package org.jeecg.modules.ngalain.service;
 //
 //import com.alibaba.fastjson.JSONArray;
 //

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/ngalain/service/impl/NgAlainServiceImpl.java

@@ -1,4 +1,4 @@
-//package org.jeecg.modules.ngalain.service.impl;
+package org.jeecg.modules.ngalain.service.impl;//package org.jeecg.modules.ngalain.service.impl;
 //
 //import com.alibaba.fastjson.JSONArray;
 //import com.alibaba.fastjson.JSONObject;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java

@@ -27,36 +27,36 @@ public class QuartzJob implements Serializable {
     
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
+	private String id;
 	/**创建人*/
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 	/**删除状态*/
-	private java.lang.Integer delFlag;
+	private Integer delFlag;
 	/**修改人*/
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**修改时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**任务类名*/
 	@Excel(name="任务类名",width=40)
-	private java.lang.String jobClassName;
+	private String jobClassName;
 	/**cron表达式*/
 	@Excel(name="cron表达式",width=30)
-	private java.lang.String cronExpression;
+	private String cronExpression;
 	/**参数*/
 	@Excel(name="参数",width=15)
-	private java.lang.String parameter;
+	private String parameter;
 	/**描述*/
 	@Excel(name="描述",width=40)
-	private java.lang.String description;
+	private String description;
 	/**状态 0正常 -1停止*/
 	@Excel(name="状态",width=15,dicCode="quartz_status")
 	@Dict(dicCode = "quartz_status")
-	private java.lang.Integer status;
+	private Integer status;
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncement.java

@@ -26,17 +26,17 @@ public class SysAnnouncement implements Serializable {
      * id
      */
     @TableId(type = IdType.ASSIGN_ID)
-    private java.lang.String id;
+    private String id;
     /**
      * 标题
      */
     @Excel(name = "标题", width = 15)
-    private java.lang.String titile;
+    private String titile;
     /**
      * 内容
      */
     @Excel(name = "内容", width = 30)
-    private java.lang.String msgContent;
+    private String msgContent;
     /**
      * 开始时间
      */
@@ -55,32 +55,32 @@ public class SysAnnouncement implements Serializable {
      * 发布人
      */
     @Excel(name = "发布人", width = 15)
-    private java.lang.String sender;
+    private String sender;
     /**
      * 优先级（L低，M中，H高）
      */
     @Excel(name = "优先级", width = 15, dicCode = "priority")
     @Dict(dicCode = "priority")
-    private java.lang.String priority;
+    private String priority;
     
     /**
      * 消息类型1:通知公告2:系统消息
      */
     @Excel(name = "消息类型", width = 15, dicCode = "msg_category")
     @Dict(dicCode = "msg_category")
-    private java.lang.String msgCategory;
+    private String msgCategory;
     /**
      * 通告对象类型（USER:指定用户，ALL:全体用户）
      */
     @Excel(name = "通告对象类型", width = 15, dicCode = "msg_type")
     @Dict(dicCode = "msg_type")
-    private java.lang.String msgType;
+    private String msgType;
     /**
      * 发布状态（0未发布，1已发布，2已撤销）
      */
     @Excel(name = "发布状态", width = 15, dicCode = "send_status")
     @Dict(dicCode = "send_status")
-    private java.lang.String sendStatus;
+    private String sendStatus;
     /**
      * 发布时间
      */
@@ -98,11 +98,11 @@ public class SysAnnouncement implements Serializable {
     /**
      * 删除状态（0，正常，1已删除）
      */
-    private java.lang.String delFlag;
+    private String delFlag;
     /**
      * 创建人
      */
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 创建时间
      */
@@ -112,7 +112,7 @@ public class SysAnnouncement implements Serializable {
     /**
      * 更新人
      */
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 更新时间
      */
@@ -122,23 +122,23 @@ public class SysAnnouncement implements Serializable {
     /**
      * 指定用户
      **/
-    private java.lang.String userIds;
+    private String userIds;
     /**
      * 业务类型(email:邮件 bpm:流程 tenant_invite:租户邀请)
      */
-    private java.lang.String busType;
+    private String busType;
     /**
      * 业务id
      */
-    private java.lang.String busId;
+    private String busId;
     /**
      * 打开方式 组件：component 路由：url
      */
-    private java.lang.String openType;
+    private String openType;
     /**
      * 组件/路由 地址
      */
-    private java.lang.String openPage;
+    private String openPage;
     /**
      * 摘要/扩展业务参数
      * 
@@ -148,7 +148,7 @@ public class SysAnnouncement implements Serializable {
      * 2 跳转流程的参数值
      * {"taskDetail":true,"procInsId":"1706547306004377602","taskId":"task630958764530507776"}
      */
-    private java.lang.String msgAbstract;
+    private String msgAbstract;
     /**
      * 钉钉task_id，用于撤回消息
      */
@@ -170,5 +170,5 @@ public class SysAnnouncement implements Serializable {
     private transient String sendId;
 
     /**租户ID*/
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java

@@ -22,29 +22,29 @@ public class SysAnnouncementSend implements Serializable {
     
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
+	private String id;
 	/**通告id*/
-	private java.lang.String anntId;
+	private String anntId;
 	/**用户id*/
-	private java.lang.String userId;
+	private String userId;
 	/**阅读状态（0未读，1已读）*/
-	private java.lang.Integer readFlag;
+	private Integer readFlag;
 	/**阅读时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date readTime;
+	private Date readTime;
 	/**创建人*/
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
+	private Date createTime;
 	/**更新人*/
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
+	private Date updateTime;
 
 	/**
 	 * 是否标星 当值为1是标星消息

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCategory.java

@@ -23,35 +23,35 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
     
 	/**主键*/
 	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
+	private String id;
 	/**父级节点*/
-	private java.lang.String pid;
+	private String pid;
 	/**类型名称*/
 	@Excel(name = "类型名称", width = 15)
-	private java.lang.String name;
+	private String name;
 	/**类型编码*/
 	@Excel(name = "类型编码", width = 15)
-	private java.lang.String code;
+	private String code;
 	/**创建人*/
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date createTime;
 	/**更新人*/
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date updateTime;
 	/**所属部门*/
-	private java.lang.String sysOrgCode;
+	private String sysOrgCode;
 	/**是否有子节点*/
 	@Excel(name = "是否有子节点(1:有)", width = 15)
-	private java.lang.String hasChild;
+	private String hasChild;
 
 	/**租户ID*/
-	private java.lang.Integer tenantId;
+	private Integer tenantId;
 
 	@Override
 	public int compareTo(SysCategory o) {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java

@@ -31,67 +31,67 @@ public class SysDataSource {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-    private java.lang.String id;
+    private String id;
     /**
      * 数据源编码
      */
     @Excel(name = "数据源编码", width = 15)
     @Schema(description = "数据源编码")
-    private java.lang.String code;
+    private String code;
     /**
      * 数据源名称
      */
     @Excel(name = "数据源名称", width = 15)
     @Schema(description = "数据源名称")
-    private java.lang.String name;
+    private String name;
     /**
      * 描述
      */
     @Excel(name = "备注", width = 15)
     @Schema(description = "备注")
-    private java.lang.String remark;
+    private String remark;
     /**
      * 数据库类型
      */
     @Dict(dicCode = "database_type")
     @Excel(name = "数据库类型", width = 15, dicCode = "database_type")
     @Schema(description = "数据库类型")
-    private java.lang.String dbType;
+    private String dbType;
     /**
      * 驱动类
      */
     @Excel(name = "驱动类", width = 15)
     @Schema(description = "驱动类")
-    private java.lang.String dbDriver;
+    private String dbDriver;
     /**
      * 数据源地址
      */
     @Excel(name = "数据源地址", width = 15)
     @Schema(description = "数据源地址")
-    private java.lang.String dbUrl;
+    private String dbUrl;
     /**
      * 数据库名称
      */
     @Excel(name = "数据库名称", width = 15)
     @Schema(description = "数据库名称")
-    private java.lang.String dbName;
+    private String dbName;
     /**
      * 用户名
      */
     @Excel(name = "用户名", width = 15)
     @Schema(description = "用户名")
-    private java.lang.String dbUsername;
+    private String dbUsername;
     /**
      * 密码
      */
     @Excel(name = "密码", width = 15)
     @Schema(description = "密码")
-    private java.lang.String dbPassword;
+    private String dbPassword;
     /**
      * 创建人
      */
     @Schema(description = "创建人")
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 创建日期
      */
@@ -103,7 +103,7 @@ public class SysDataSource {
      * 更新人
      */
     @Schema(description = "更新人")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 更新日期
      */
@@ -116,9 +116,9 @@ public class SysDataSource {
      */
     @Excel(name = "所属部门", width = 15)
     @Schema(description = "所属部门")
-    private java.lang.String sysOrgCode;
+    private String sysOrgCode;
 
     /**租户ID*/
     @Schema(description = "租户ID")
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java

@@ -89,7 +89,7 @@ public class SysDepart implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 	/**租户ID*/
-	private java.lang.Integer tenantId;
+	private Integer tenantId;
 
 	/**是否有叶子节点: 1是0否*/
 	private Integer izLeaf;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java

@@ -31,18 +31,18 @@ public class SysDepartPermission {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-	private java.lang.String id;
+	private String id;
 	/**部门id*/
 	@Excel(name = "部门id", width = 15)
     @Schema(description = "部门id")
-	private java.lang.String departId;
+	private String departId;
 	/**权限id*/
 	@Excel(name = "权限id", width = 15)
     @Schema(description = "权限id")
-	private java.lang.String permissionId;
+	private String permissionId;
 	/**数据规则id*/
 	@Schema(description = "数据规则id")
-	private java.lang.String dataRuleIds;
+	private String dataRuleIds;
 
 	public SysDepartPermission() {
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java

@@ -32,44 +32,44 @@ public class SysDepartRole {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-	private java.lang.String id;
+	private String id;
 	/**部门id*/
 	@Excel(name = "部门id", width = 15)
 	@Schema(description = "部门id")
 	@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
-	private java.lang.String departId;
+	private String departId;
 	/**部门角色名称*/
 	@Excel(name = "部门角色名称", width = 15)
     @Schema(description = "部门角色名称")
-	private java.lang.String roleName;
+	private String roleName;
 	/**部门角色编码*/
 	@Excel(name = "部门角色编码", width = 15)
     @Schema(description = "部门角色编码")
-	private java.lang.String roleCode;
+	private String roleCode;
 	/**描述*/
 	@Excel(name = "描述", width = 15)
     @Schema(description = "描述")
-	private java.lang.String description;
+	private String description;
 	/**创建人*/
 	@Excel(name = "创建人", width = 15)
     @Schema(description = "创建人")
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建时间*/
 	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建时间")
-	private java.util.Date createTime;
+	private Date createTime;
 	/**更新人*/
 	@Excel(name = "更新人", width = 15)
     @Schema(description = "更新人")
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新时间*/
 	@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新时间")
-	private java.util.Date updateTime;
+	private Date updateTime;
 
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java

@@ -31,31 +31,31 @@ public class SysDepartRolePermission {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-	private java.lang.String id;
+	private String id;
 	/**部门id*/
 	@Excel(name = "部门id", width = 15)
     @Schema(description = "部门id")
-	private java.lang.String departId;
+	private String departId;
 	/**角色id*/
 	@Excel(name = "角色id", width = 15)
     @Schema(description = "角色id")
-	private java.lang.String roleId;
+	private String roleId;
 	/**权限id*/
 	@Excel(name = "权限id", width = 15)
     @Schema(description = "权限id")
-	private java.lang.String permissionId;
+	private String permissionId;
 	/**dataRuleIds*/
 	@Excel(name = "dataRuleIds", width = 15)
     @Schema(description = "dataRuleIds")
-	private java.lang.String dataRuleIds;
+	private String dataRuleIds;
 	/** 操作时间 */
 	@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@Schema(description = "操作时间")
-	private java.util.Date operateDate;
+	private Date operateDate;
 	/** 操作ip */
-	private java.lang.String operateIp;
+	private String operateIp;
 
 	public SysDepartRolePermission() {
 	}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java

@@ -31,15 +31,15 @@ public class SysDepartRoleUser {
 	/**主键id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键id")
-	private java.lang.String id;
+	private String id;
 	/**用户id*/
 	@Excel(name = "用户id", width = 15)
     @Schema(description = "用户id")
-	private java.lang.String userId;
+	private String userId;
 	/**角色id*/
 	@Excel(name = "角色id", width = 15)
     @Schema(description = "角色id")
-	private java.lang.String droleId;
+	private String droleId;
 
 	public SysDepartRoleUser() {
 

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDict.java

@@ -82,9 +82,9 @@ public class SysDict implements Serializable {
     private Date updateTime;
 
     /**租户ID*/
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
     
     /** 关联的低代码应用ID */
-    private java.lang.String lowAppId;
+    private String lowAppId;
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java

@@ -30,37 +30,37 @@ public class SysFillRule {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键ID")
-    private java.lang.String id;
+    private String id;
     /**
      * 规则名称
      */
     @Excel(name = "规则名称", width = 15)
     @Schema(description = "规则名称")
-    private java.lang.String ruleName;
+    private String ruleName;
     /**
      * 规则Code
      */
     @Excel(name = "规则Code", width = 15)
     @Schema(description = "规则Code")
-    private java.lang.String ruleCode;
+    private String ruleCode;
     /**
      * 规则实现类
      */
     @Excel(name = "规则实现类", width = 15)
     @Schema(description = "规则实现类")
-    private java.lang.String ruleClass;
+    private String ruleClass;
     /**
      * 规则参数
      */
     @Excel(name = "规则参数", width = 15)
     @Schema(description = "规则参数")
-    private java.lang.String ruleParams;
+    private String ruleParams;
     /**
      * 修改人
      */
     @Excel(name = "修改人", width = 15)
     @Schema(description = "修改人")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 修改时间
      */
@@ -74,7 +74,7 @@ public class SysFillRule {
      */
     @Excel(name = "创建人", width = 15)
     @Schema(description = "创建人")
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 创建时间
      */

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java

@@ -151,7 +151,7 @@ public class SysPermission implements Serializable {
 	private Date updateTime;
 	
 	/**按钮权限状态(0无效1有效)*/
-	private java.lang.String status;
+	private String status;
 	
 	/**alwaysShow*/
     private boolean alwaysShow;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPosition.java

@@ -31,36 +31,36 @@ public class SysPosition {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-    private java.lang.String id;
+    private String id;
     /**
      * 职务编码
      */
     @Excel(name = "职务编码", width = 15)
     @Schema(description = "职务编码")
-    private java.lang.String code;
+    private String code;
     /**
      * 职务名称
      */
     @Excel(name = "职务名称", width = 15)
     @Schema(description = "职务名称")
-    private java.lang.String name;
+    private String name;
     /**
      * 职级
      */
     //@Excel(name = "职级", width = 15,dicCode ="position_rank")
     @Schema(description = "职级")
     @Dict(dicCode = "position_rank")
-    private java.lang.String postRank;
+    private String postRank;
     /**
      * 公司id
      */
     @Schema(description = "公司id")
-    private java.lang.String companyId;
+    private String companyId;
     /**
      * 创建人
      */
     @Schema(description = "创建人")
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 创建时间
      */
@@ -72,7 +72,7 @@ public class SysPosition {
      * 修改人
      */
     @Schema(description = "修改人")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 修改时间
      */
@@ -84,9 +84,9 @@ public class SysPosition {
      * 组织机构编码
      */
     @Schema(description = "组织机构编码")
-    private java.lang.String sysOrgCode;
+    private String sysOrgCode;
 
     /**租户ID*/
     @Schema(description = "租户ID")
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRole.java

@@ -79,5 +79,5 @@ public class SysRole implements Serializable {
     private Date updateTime;
 
     /**租户ID*/
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysRoleIndex.java

@@ -31,19 +31,19 @@ public class SysRoleIndex {
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-	private java.lang.String id;
+	private String id;
 	/**角色编码*/
 	@Excel(name = "角色编码", width = 15)
     @Schema(description = "角色编码")
-	private java.lang.String roleCode;
+	private String roleCode;
 	/**路由地址*/
 	@Excel(name = "路由地址", width = 15)
     @Schema(description = "路由地址")
-	private java.lang.String url;
+	private String url;
 	/**路由地址*/
 	@Excel(name = "路由地址", width = 15)
     @Schema(description = "组件")
-	private java.lang.String component;
+	private String component;
 	/**
 	 * 是否路由菜单: 0:不是  1:是（默认值1）
 	 */
@@ -54,35 +54,35 @@ public class SysRoleIndex {
 	/**优先级*/
 	@Excel(name = "优先级", width = 15)
     @Schema(description = "优先级")
-	private java.lang.Integer priority;
+	private Integer priority;
 	/**路由地址*/
 	@Excel(name = "状态", width = 15)
 	@Schema(description = "状态")
-	private java.lang.String status;
+	private String status;
 	/**创建人登录名称*/
 	@Excel(name = "创建人登录名称", width = 15)
     @Schema(description = "创建人登录名称")
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建日期*/
 	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
-	private java.util.Date createTime;
+	private Date createTime;
 	/**更新人登录名称*/
 	@Excel(name = "更新人登录名称", width = 15)
     @Schema(description = "更新人登录名称")
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新日期*/
 	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
-	private java.util.Date updateTime;
+	private Date updateTime;
 	/**所属部门*/
 	@Excel(name = "所属部门", width = 15)
     @Schema(description = "所属部门")
-	private java.lang.String sysOrgCode;
+	private String sysOrgCode;
 
 
 	public SysRoleIndex() {

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTableWhiteList.java

@@ -30,31 +30,31 @@ public class SysTableWhiteList {
      */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键id")
-    private java.lang.String id;
+    private String id;
     /**
      * 允许的表名
      */
     @Excel(name = "允许的表名", width = 15)
     @Schema(description = "允许的表名")
-    private java.lang.String tableName;
+    private String tableName;
     /**
      * 允许的字段名，多个用逗号分割
      */
     @Excel(name = "允许的字段名", width = 15)
     @Schema(description = "允许的字段名")
-    private java.lang.String fieldName;
+    private String fieldName;
     /**
      * 状态，1=启用，0=禁用
      */
     @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
-    private java.lang.String status;
+    private String status;
     /**
      * 创建人
      */
     @Excel(name = "创建人", width = 15)
     @Schema(description = "创建人")
-    private java.lang.String createBy;
+    private String createBy;
     /**
      * 创建时间
      */
@@ -68,7 +68,7 @@ public class SysTableWhiteList {
      */
     @Excel(name = "更新人", width = 15)
     @Schema(description = "更新人")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**
      * 更新时间
      */

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysTenantPackUser.java

@@ -31,22 +31,22 @@ public class SysTenantPackUser implements Serializable {
     /**id*/
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "id")
-    private java.lang.String id;
+    private String id;
     /**租户产品包ID*/
     @Excel(name = "租户产品包ID", width = 15)
     @Schema(description = "租户产品包ID")
-    private java.lang.String packId;
+    private String packId;
     /**用户ID*/
     @Excel(name = "用户ID", width = 15)
     @Schema(description = "用户ID")
-    private java.lang.String userId;
+    private String userId;
     /**租户ID*/
     @Excel(name = "租户ID", width = 15)
     @Schema(description = "租户ID")
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
     /**创建人*/
     @Schema(description = "创建人")
-    private java.lang.String createBy;
+    private String createBy;
     /**创建时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -54,7 +54,7 @@ public class SysTenantPackUser implements Serializable {
     private java.util.Date createTime;
     /**更新人*/
     @Schema(description = "更新人")
-    private java.lang.String updateBy;
+    private String updateBy;
     /**更新时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysThirdAccount.java

@@ -28,42 +28,42 @@ public class SysThirdAccount {
 	/**编号*/
 	@TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "编号")
-	private java.lang.String id;
+	private String id;
 	/**第三方登录id*/
 	@Excel(name = "第三方登录id", width = 15)
 	@Schema(description = "第三方登录id")
-	private java.lang.String sysUserId;
+	private String sysUserId;
 	/**登录来源*/
 	@Excel(name = "登录来源", width = 15)
 	@Schema(description = "登录来源")
-	private java.lang.String thirdType;
+	private String thirdType;
 	/**头像*/
 	@Excel(name = "头像", width = 15)
 	@Schema(description = "头像")
-	private java.lang.String avatar;
+	private String avatar;
 	/**状态(1-正常,2-冻结)*/
 	@Excel(name = "状态(1-正常,2-冻结)", width = 15)
 	@Schema(description = "状态(1-正常,2-冻结)")
-	private java.lang.Integer status;
+	private Integer status;
 	/**删除状态(0-正常,1-已删除)*/
 	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
 	@Schema(description = "删除状态(0-正常,1-已删除)")
-	private java.lang.Integer delFlag;
+	private Integer delFlag;
 	/**真实姓名*/
 	@Excel(name = "真实姓名", width = 15)
 	@Schema(description = "真实姓名")
-	private java.lang.String realname;
+	private String realname;
 	/**第三方用户uuid*/
 	@Excel(name = "第三方用户uuid", width = 15)
 	@Schema(description = "第三方用户uuid")
-	private java.lang.String thirdUserUuid;
+	private String thirdUserUuid;
 	/**第三方用户账号*/
 	@Excel(name = "第三方用户账号", width = 15)
 	@Schema(description = "第三方用户账号")
-	private java.lang.String thirdUserId;
+	private String thirdUserId;
     /**创建人*/
     @Excel(name = "创建人", width = 15)
-    private java.lang.String createBy;
+    private String createBy;
     /**创建日期*/
     @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -71,7 +71,7 @@ public class SysThirdAccount {
     private java.util.Date createTime;
     /**修改人*/
     @Excel(name = "修改人", width = 15)
-    private java.lang.String updateBy;
+    private String updateBy;
     /**修改日期*/
     @Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -79,5 +79,5 @@ public class SysThirdAccount {
     private java.util.Date updateTime;
 
 	/**租户id*/
-	private java.lang.Integer tenantId;
+	private Integer tenantId;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserAgent.java

@@ -23,52 +23,52 @@ public class SysUserAgent implements Serializable {
     
 	/**序号*/
 	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
+	private String id;
 	/**用户名*/
 	@Excel(name = "用户名", width = 15)
-	private java.lang.String userName;
+	private String userName;
 	/**代理人用户名*/
 	@Excel(name = "代理人用户名", width = 15)
-	private java.lang.String agentUserName;
+	private String agentUserName;
 	/**代理开始时间*/
 	@Excel(name = "代理开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date startTime;
+	private Date startTime;
 	/**代理结束时间*/
 	@Excel(name = "代理结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date endTime;
+	private Date endTime;
 	/**状态0无效1有效*/
 	@Excel(name = "状态0无效1有效", width = 15)
-	private java.lang.String status;
+	private String status;
 	/**创建人名称*/
 	@Excel(name = "创建人名称", width = 15)
-	private java.lang.String createName;
+	private String createName;
 	/**创建人登录名称*/
 	@Excel(name = "创建人登录名称", width = 15)
-	private java.lang.String createBy;
+	private String createBy;
 	/**创建日期*/
 	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
+	private Date createTime;
 	/**更新人名称*/
 	@Excel(name = "更新人名称", width = 15)
-	private java.lang.String updateName;
+	private String updateName;
 	/**更新人登录名称*/
 	@Excel(name = "更新人登录名称", width = 15)
-	private java.lang.String updateBy;
+	private String updateBy;
 	/**更新日期*/
 	@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
+	private Date updateTime;
 	/**所属部门*/
 	@Excel(name = "所属部门", width = 15)
-	private java.lang.String sysOrgCode;
+	private String sysOrgCode;
 	/**所属公司*/
 	@Excel(name = "所属公司", width = 15)
-	private java.lang.String sysCompanyCode;
+	private String sysCompanyCode;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUserRole.java

@@ -38,7 +38,7 @@ public class SysUserRole implements Serializable {
     private String roleId;
     
     /**租户ID*/
-    private java.lang.Integer tenantId;
+    private Integer tenantId;
     
 	public SysUserRole() {
 	}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/model/AnnouncementSendModel.java

@@ -20,67 +20,67 @@ public class AnnouncementSendModel implements Serializable {
     
 	/**id*/
 	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
+	private String id;
 	/**通告id*/
-	private java.lang.String anntId;
+	private String anntId;
 	/**用户id*/
-	private java.lang.String userId;
+	private String userId;
 	/**标题*/
-	private java.lang.String titile;
+	private String titile;
 	/**内容*/
-	private java.lang.String msgContent;
+	private String msgContent;
 	/**发布人*/
-	private java.lang.String sender;
+	private String sender;
 	/**优先级（L低，M中，H高）*/
-	private java.lang.String priority;
+	private String priority;
 	/**阅读状态*/
-	private java.lang.Integer readFlag;
+	private Integer readFlag;
 	/**发布时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private java.util.Date sendTime;
 	/**页数*/
-	private java.lang.Integer pageNo;
+	private Integer pageNo;
 	/**大小*/
-	private java.lang.Integer pageSize;
+	private Integer pageSize;
     /**
      * 消息类型1:通知公告2:系统消息
      */
-    private java.lang.String msgCategory;
+    private String msgCategory;
 	/**
 	 * 业务id
 	 */
-	private java.lang.String busId;
+	private String busId;
 	/**
 	 * 业务类型
 	 */
-	private java.lang.String busType;
+	private String busType;
 	/**
 	 * 打开方式 组件：component 路由：url
 	 */
-	private java.lang.String openType;
+	private String openType;
 	/**
 	 * 组件/路由 地址
 	 */
-	private java.lang.String openPage;
+	private String openPage;
 
 	/**
 	 * 业务类型查询（0.非bpm业务）
 	 */
-	private java.lang.String bizSource;
+	private String bizSource;
 
 	/**
 	 * 摘要
 	 */
-	private java.lang.String msgAbstract;
+	private String msgAbstract;
 
 	/**
 	 * 发布开始日期
 	 */
-	private java.lang.String sendTimeBegin;
+	private String sendTimeBegin;
 	
 	/**
 	 * 发布结束日期
 	 */
-	private java.lang.String sendTimeEnd;
+	private String sendTimeEnd;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/model/SysPermissionTree.java

@@ -129,7 +129,7 @@ public class SysPermissionTree implements Serializable {
     private boolean hidden;
     
     /**按钮权限状态(0无效1有效)*/
-	private java.lang.String status;
+	private String status;
 
 	/*update_begin author:wuxianquan date:20190908 for:model增加字段 */
 	/** 外链菜单打开方式 0/内部打开 1/外部打开 */
@@ -401,11 +401,11 @@ public class SysPermissionTree implements Serializable {
 		this.permsType = permsType;
 	}
 
-	public java.lang.String getStatus() {
+	public String getStatus() {
 		return status;
 	}
 
-	public void setStatus(java.lang.String status) {
+	public void setStatus(String status) {
 		this.status = status;
 	}
 

national-motion-module-system/national-motion-system-start/src/main/resources/application-dev.yml

@@ -149,7 +149,7 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://192.168.110.241:3306/national_motion?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://192.168.110.241:3306/national_motion?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: c7ix0bJv2GvyhbkRw6
           # 多数据源配置

national-motion-module-system/national-motion-system-start/src/main/resources/jeecg/jeecg_config.properties

@@ -26,4 +26,4 @@ db_filed_convert=true
 page_search_filed_num=1
 #page_filter_fields
 page_filter_fields=create_time,create_by,update_time,update_by
-exclude_table=
+exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_

national-motion-module-system/national-motion-system-start/src/main/resources/jeecg/jeecg_database.properties

@@ -1,9 +1,9 @@
 #mysql
 diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://192.168.110.241:3306/national_motion?useUnicode=true&characterEncoding=UTF-8
 username=root
-password=root
-database_name=jeecg-boot
+password=c7ix0bJv2GvyhbkRw6
+database_name=national_motion
 
 #oracle
 #diver_name=oracle.jdbc.driver.OracleDriver