DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6 同步develop分支

Browse Source 
* sync -- 同步develop分支
This commit is contained in:
KonBAI
2022-01-18 13:16:15 +00:00
parent a649962696
commit 5676316380
338 changed files with 10957 additions and 9551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
View File

@@ -70,7 +70,7 @@ public class SysConfig extends BaseEntity {
*/
@ApiModelProperty(value = "系统内置（Y是 N否）")
@ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_yes_no")
@ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
/**

6
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
View File

@@ -52,7 +52,7 @@ public class SysOperLog implements Serializable {
*/
@ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
@ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_oper_type")
@ExcelDictFormat(dictType = "sys_oper_type")
private Integer businessType;
/**
@@ -81,7 +81,7 @@ public class SysOperLog implements Serializable {
*/
@ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
@ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
@ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
private Integer operatorType;
/**
@@ -138,7 +138,7 @@ public class SysOperLog implements Serializable {
*/
@ApiModelProperty(value = "操作状态（0正常 1异常）")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
@ExcelDictFormat(dictType = "sys_common_status")
private Integer status;
/**

50
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
View File

@@ -19,35 +19,35 @@ import lombok.experimental.Accessors;
@TableName("sys_oss")
public class SysOss extends BaseEntity {
/**
* 对象存储主键
*/
@TableId(value = "oss_id", type = IdType.AUTO)
private Long ossId;
/**
* 对象存储主键
*/
@TableId(value = "oss_id", type = IdType.AUTO)
private Long ossId;
/**
* 文件名
*/
private String fileName;
/**
* 文件名
*/
private String fileName;
/**
* 原名
*/
private String originalName;
/**
* 原名
*/
private String originalName;
/**
* 文件后缀名
*/
private String fileSuffix;
/**
* 文件后缀名
*/
private String fileSuffix;
/**
* URL地址
*/
private String url;
/**
* URL地址
*/
private String url;
/**
* 服务商
*/
private String service;
/**
* 服务商
*/
private String service;
}

4
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
View File

@@ -69,8 +69,8 @@ public class SysPost extends BaseEntity {
* 状态（0正常 1停用）
*/
@ApiModelProperty(value = "状态（0正常 1停用）")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status")
private String status;
/**

3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +23,7 @@ public class SysRoleDept {
/**
* 角色ID
*/
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "角色ID")
private Long roleId;

3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +23,7 @@ public class SysRoleMenu {
/**
* 角色ID
*/
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "角色ID")
private Long roleId;

3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +23,7 @@ public class SysUserPost {
/**
* 用户ID
*/
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "用户ID")
private Long userId;

3
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
View File

@@ -1,5 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +23,7 @@ public class SysUserRole {
/**
* 用户ID
*/
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "用户ID")
private Long userId;