diff --git a/pom.xml b/pom.xml
index 0e857eb..49ab9e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
pom
springboot-parent
杭州铁晟科技有限公司基础依赖
@@ -57,55 +57,55 @@
com.tiesheng.springboot-parent
springboot-database
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-login
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-web
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-util
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-platform
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-message
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-encrypt
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-annotation
- 0.9.1
+ 0.9.2
com.tiesheng.springboot-parent
springboot-poi
- 0.9.1
+ 0.9.2
diff --git a/springboot-ademo/pom.xml b/springboot-ademo/pom.xml
index fb9f027..719414e 100644
--- a/springboot-ademo/pom.xml
+++ b/springboot-ademo/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-ademo
diff --git a/springboot-annotation/pom.xml b/springboot-annotation/pom.xml
index c9e72b9..373f778 100644
--- a/springboot-annotation/pom.xml
+++ b/springboot-annotation/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-annotation
diff --git a/springboot-database/pom.xml b/springboot-database/pom.xml
index 92da766..73004e4 100644
--- a/springboot-database/pom.xml
+++ b/springboot-database/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-database
diff --git a/springboot-encrypt/pom.xml b/springboot-encrypt/pom.xml
index fc809bb..398613e 100644
--- a/springboot-encrypt/pom.xml
+++ b/springboot-encrypt/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-encrypt
diff --git a/springboot-login/pom.xml b/springboot-login/pom.xml
index 9560ad2..766c512 100644
--- a/springboot-login/pom.xml
+++ b/springboot-login/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-login
diff --git a/springboot-message/pom.xml b/springboot-message/pom.xml
index 6dcc468..5ae6ecc 100644
--- a/springboot-message/pom.xml
+++ b/springboot-message/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-message
diff --git a/springboot-platform/pom.xml b/springboot-platform/pom.xml
index d52f9dd..70527e9 100644
--- a/springboot-platform/pom.xml
+++ b/springboot-platform/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-platform
diff --git a/springboot-poi/pom.xml b/springboot-poi/pom.xml
index 13c616a..e6aae5b 100644
--- a/springboot-poi/pom.xml
+++ b/springboot-poi/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-poi
diff --git a/springboot-util/pom.xml b/springboot-util/pom.xml
index 316472f..b7ee4a3 100644
--- a/springboot-util/pom.xml
+++ b/springboot-util/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-util
diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml
index 543437c..3c43cb3 100644
--- a/springboot-web/pom.xml
+++ b/springboot-web/pom.xml
@@ -6,7 +6,7 @@
com.tiesheng.springboot-parent
springboot-parent
- 0.9.1
+ 0.9.2
springboot-web
diff --git a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobUserMapper.java b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobUserMapper.java
index ba59ee1..5df00d8 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobUserMapper.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/mapper/CoreJobUserMapper.java
@@ -8,8 +8,6 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface CoreJobUserMapper extends BaseMapper {
-
-
/**
* 获取指定用户的职位和功能点
*
@@ -17,5 +15,4 @@ public interface CoreJobUserMapper extends BaseMapper {
* @return
*/
List list(@Param("userId") String userId);
-
-}
+}
\ No newline at end of file
diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJob.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJob.java
index c38fe08..31d5230 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJob.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJob.java
@@ -30,30 +30,6 @@ public class CoreJob extends DaoBase {
@TableField(value = "is_system")
private Integer isSystem;
- /**
- * 扩展1
- */
- @TableField(value = "ext1")
- private String ext1;
-
- /**
- * 扩展2
- */
- @TableField(value = "ext2")
- private String ext2;
-
- /**
- * 扩展3
- */
- @TableField(value = "ext3")
- private String ext3;
-
- /**
- * 扩展文本
- */
- @TableField(value = "ext_text")
- private String extText;
-
/**
* 获取名称
*
@@ -107,76 +83,4 @@ public class CoreJob extends DaoBase {
public void setIsSystem(Integer isSystem) {
this.isSystem = isSystem;
}
-
- /**
- * 获取扩展1
- *
- * @return ext1 - 扩展1
- */
- public String getExt1() {
- return ext1;
- }
-
- /**
- * 设置扩展1
- *
- * @param ext1 扩展1
- */
- public void setExt1(String ext1) {
- this.ext1 = ext1;
- }
-
- /**
- * 获取扩展2
- *
- * @return ext2 - 扩展2
- */
- public String getExt2() {
- return ext2;
- }
-
- /**
- * 设置扩展2
- *
- * @param ext2 扩展2
- */
- public void setExt2(String ext2) {
- this.ext2 = ext2;
- }
-
- /**
- * 获取扩展3
- *
- * @return ext3 - 扩展3
- */
- public String getExt3() {
- return ext3;
- }
-
- /**
- * 设置扩展3
- *
- * @param ext3 扩展3
- */
- public void setExt3(String ext3) {
- this.ext3 = ext3;
- }
-
- /**
- * 获取扩展文本
- *
- * @return ext_text - 扩展文本
- */
- public String getExtText() {
- return extText;
- }
-
- /**
- * 设置扩展文本
- *
- * @param extText 扩展文本
- */
- public void setExtText(String extText) {
- this.extText = extText;
- }
}
\ No newline at end of file
diff --git a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobUser.java b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobUser.java
index 390b250..ac3212e 100644
--- a/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobUser.java
+++ b/springboot-web/src/main/java/com/tiesheng/core/pojos/dao/CoreJobUser.java
@@ -8,8 +8,8 @@ import com.tiesheng.core.pojos.DaoBase;
import java.util.Date;
/**
- * 职位-用户
- */
+ * 职位-用户
+ */
@TableName(value = "core_job_user")
public class CoreJobUser extends DaoBase {
/**
@@ -24,6 +24,30 @@ public class CoreJobUser extends DaoBase {
@TableField(value = "job_id")
private String jobId;
+ /**
+ * 扩展1
+ */
+ @TableField(value = "ext1")
+ private String ext1;
+
+ /**
+ * 扩展2
+ */
+ @TableField(value = "ext2")
+ private String ext2;
+
+ /**
+ * 扩展3
+ */
+ @TableField(value = "ext3")
+ private String ext3;
+
+ /**
+ * 扩展文本
+ */
+ @TableField(value = "ext_text")
+ private String extText;
+
/**
* 获取用户id
*
@@ -59,4 +83,76 @@ public class CoreJobUser extends DaoBase {
public void setJobId(String jobId) {
this.jobId = jobId;
}
+
+ /**
+ * 获取扩展1
+ *
+ * @return ext1 - 扩展1
+ */
+ public String getExt1() {
+ return ext1;
+ }
+
+ /**
+ * 设置扩展1
+ *
+ * @param ext1 扩展1
+ */
+ public void setExt1(String ext1) {
+ this.ext1 = ext1;
+ }
+
+ /**
+ * 获取扩展2
+ *
+ * @return ext2 - 扩展2
+ */
+ public String getExt2() {
+ return ext2;
+ }
+
+ /**
+ * 设置扩展2
+ *
+ * @param ext2 扩展2
+ */
+ public void setExt2(String ext2) {
+ this.ext2 = ext2;
+ }
+
+ /**
+ * 获取扩展3
+ *
+ * @return ext3 - 扩展3
+ */
+ public String getExt3() {
+ return ext3;
+ }
+
+ /**
+ * 设置扩展3
+ *
+ * @param ext3 扩展3
+ */
+ public void setExt3(String ext3) {
+ this.ext3 = ext3;
+ }
+
+ /**
+ * 获取扩展文本
+ *
+ * @return ext_text - 扩展文本
+ */
+ public String getExtText() {
+ return extText;
+ }
+
+ /**
+ * 设置扩展文本
+ *
+ * @param extText 扩展文本
+ */
+ public void setExtText(String extText) {
+ this.extText = extText;
+ }
}
\ No newline at end of file
diff --git a/springboot-web/src/main/resources/db/migration/core_job.sql b/springboot-web/src/main/resources/db/migration/core_job.sql
index 83ab071..632d64a 100644
--- a/springboot-web/src/main/resources/db/migration/core_job.sql
+++ b/springboot-web/src/main/resources/db/migration/core_job.sql
@@ -67,16 +67,16 @@ CREATE TABLE `core_job_user`
-- Table change for core_job_user
-- ----------------------------
-alter table core_job
+alter table core_job_user
add ext1 varchar(255) null comment '扩展1';
-alter table core_job
+alter table core_job_user
add ext2 varchar(255) null comment '扩展2';
-alter table core_job
+alter table core_job_user
add ext3 varchar(500) null comment '扩展3';
-alter table core_job
+alter table core_job_user
add ext_text text null comment '扩展文本';
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/springboot-web/src/main/resources/mapper/CoreJobMapper.xml b/springboot-web/src/main/resources/mapper/CoreJobMapper.xml
index 2e16561..e3e0352 100644
--- a/springboot-web/src/main/resources/mapper/CoreJobMapper.xml
+++ b/springboot-web/src/main/resources/mapper/CoreJobMapper.xml
@@ -11,14 +11,9 @@
-
-
-
-
- id, create_time, update_time, is_deleted, `name`, remark, is_system, ext1, ext2,
- ext3, ext_text
+ id, create_time, update_time, is_deleted, `name`, remark, is_system
\ No newline at end of file
diff --git a/springboot-web/src/main/resources/mapper/CoreJobUserMapper.xml b/springboot-web/src/main/resources/mapper/CoreJobUserMapper.xml
index 089d63d..809e334 100644
--- a/springboot-web/src/main/resources/mapper/CoreJobUserMapper.xml
+++ b/springboot-web/src/main/resources/mapper/CoreJobUserMapper.xml
@@ -10,10 +10,14 @@
+
+
+
+
- id, create_time, update_time, is_deleted, user_id, job_id
+ id, create_time, update_time, is_deleted, user_id, job_id, ext1, ext2, ext3, ext_text
-
+
\ No newline at end of file