From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性,避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d169139..39d9db3 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -14,7 +14,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -37,6 +37,9 @@
@Excel(name = "鐢ㄦ埛鍚嶇О")
private String nickName;
+ /** 鑻辨枃鍚嶇О */
+ private String nameEn;
+
/** 鐢ㄦ埛閭 */
@Excel(name = "鐢ㄦ埛閭")
private String email;
@@ -52,6 +55,15 @@
/** 鐢ㄦ埛澶村儚 */
private String avatar;
+ /** 绛惧悕鍦板潃 */
+ private String signatureUrl;
+
+ /** 涓汉鐓х墖鍦板潃 */
+ private String pictureUrl;
+
+ /** 鍗曚綅id */
+ private String company;
+
/** 瀵嗙爜 */
private String password;
@@ -61,6 +73,9 @@
/** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
private String delFlag;
+
+ /** 瑙掕壊鍚嶇О */
+ private String roleName;
/** 鏈�鍚庣櫥褰旾P */
@Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
@@ -287,6 +302,15 @@
this.postIds = postIds;
}
+ public String getRoleName()
+ {
+ return roleName;
+ }
+
+ public void setRoleName(String roleName)
+ {
+ this.roleName = roleName;
+ }
public Long getRoleId()
{
return roleId;
@@ -295,6 +319,46 @@
public void setRoleId(Long roleId)
{
this.roleId = roleId;
+ }
+
+ public String getNameEn()
+ {
+ return nameEn;
+ }
+
+ public void setNameEn(String nameEn)
+ {
+ this.nameEn = nameEn;
+ }
+
+ public String getSignatureUrl()
+ {
+ return signatureUrl;
+ }
+
+ public void setSignatureUrl(String signatureUrl)
+ {
+ this.signatureUrl = signatureUrl;
+ }
+
+ public String getPictureUrl()
+ {
+ return pictureUrl;
+ }
+
+ public void setPictureUrl(String pictureUrl)
+ {
+ this.pictureUrl = pictureUrl;
+ }
+
+ public String getCompany()
+ {
+ return company;
+ }
+
+ public void setCompany(String company)
+ {
+ this.company = company;
}
@Override
@@ -319,6 +383,7 @@
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("roleName", getRoleName())
.toString();
}
}
--
Gitblit v1.9.3