diff --git a/ruoyi-admin/src/main/resources/template/5G+工业互联网奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/5G+工业互联网奖补模版.xlsx
new file mode 100644
index 0000000..b667334
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/5G+工业互联网奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/两业融合奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/两业融合奖补模版.xlsx
new file mode 100644
index 0000000..419c0e1
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/两业融合奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/信用管理奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/信用管理奖补模版.xlsx
new file mode 100644
index 0000000..5434db6
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/信用管理奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/做大做强奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/做大做强奖补模版.xlsx
new file mode 100644
index 0000000..dc192a0
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/做大做强奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/制造服务业有效投入奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/制造服务业有效投入奖补模版.xlsx
new file mode 100644
index 0000000..67c896d
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/制造服务业有效投入奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/品牌打造奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/品牌打造奖补模版.xlsx
new file mode 100644
index 0000000..1d29c58
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/品牌打造奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/场景开放奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/场景开放奖补模版.xlsx
new file mode 100644
index 0000000..bbdb18b
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/场景开放奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/平台建设奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/平台建设奖补模版.xlsx
new file mode 100644
index 0000000..6531293
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/平台建设奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/物流发展奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/物流发展奖补模版.xlsx
new file mode 100644
index 0000000..9d671ab
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/物流发展奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/载体建设奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/载体建设奖补模版.xlsx
new file mode 100644
index 0000000..42f577c
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/载体建设奖补模版.xlsx differ
diff --git a/ruoyi-admin/src/main/resources/template/项目落户奖补模版.xlsx b/ruoyi-admin/src/main/resources/template/项目落户奖补模版.xlsx
new file mode 100644
index 0000000..9d5964f
Binary files /dev/null and b/ruoyi-admin/src/main/resources/template/项目落户奖补模版.xlsx differ
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 d552535..17e1475 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
@@ -55,6 +55,14 @@ public class SysUser extends BaseEntity {
this.userType = userType;
}
+ public Long getEnterpriseId() {
+ return enterpriseId;
+ }
+
+ public void setEnterpriseId(Long enterpriseId) {
+ this.enterpriseId = enterpriseId;
+ }
+
/**
* 用户昵称
*/
@@ -135,7 +143,10 @@ public class SysUser extends BaseEntity {
* 岗位组
*/
private Long[] postIds;
-
+ /**
+ * 企业ID
+ */
+ private Long enterpriseId;
/**
* 角色ID
*/
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index f356ecc..2d9faa1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -12,6 +12,7 @@
+
@@ -59,6 +60,7 @@
u.phonenumber,
u.password,
u.user_type,
+ u.enterprise_id,
u.sex,
u.status,
u.del_flag,
@@ -87,7 +89,7 @@