diff --git a/.idea/easyCodeTableSettingEncode.xml b/.idea/easyCodeTableSettingEncode.xml
index 02e844c..3a8a273 100644
--- a/.idea/easyCodeTableSettingEncode.xml
+++ b/.idea/easyCodeTableSettingEncode.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
index a31a594..69ed808 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoAddCmd.java
@@ -134,6 +134,14 @@ public class CorpInfoAddCmd extends Command {
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
+ @ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
+ private String subordination;
+
+ @ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
+ private String subordinationName;
+
+ @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
+ private String fourtype;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
index fbf67e9..444a1a7 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpInfoUpdateCmd.java
@@ -135,6 +135,14 @@ public class CorpInfoUpdateCmd extends Command {
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
+ @ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
+ private String subordination;
+
+ @ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
+ private String subordinationName;
+
+ @ApiModelProperty(value = "四色图类型，1.平面四色图", name = "fourtype", required = true)
+ private String fourtype;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
index 5350e30..465dd65 100644
--- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
+++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/CorpInfoCO.java
@@ -181,6 +181,15 @@ public class CorpInfoCO extends ClientObject {
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
+ //隶属关系编码
+ @ApiModelProperty(value = "隶属关系编码")
+ private String subordination;
+ //隶属关系名称
+ @ApiModelProperty(value = "隶属关系名称")
+ private String subordinationName;
+ //四色图类型，1.平面四色图
+ @ApiModelProperty(value = "四色图类型，1.平面四色图")
+ private String fourtype;
//有无职业卫生信息,1:是,2:否
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
private Integer whetherHygiene;
diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
index 249f223..38961b8 100644
--- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
+++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpInfoE.java
@@ -129,6 +129,12 @@ public class CorpInfoE extends BaseE {
private String street;
//公司简介
private String descr;
+ //隶属关系编码
+ private String subordination;
+ //隶属关系名称
+ private String subordinationName;
+ //四色图类型，1.平面四色图
+ private String fourtype;
//有无职业卫生信息,1:是,2:否
private Integer whetherHygiene;
//有无重大危险源,1:是,2:否
diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
index 9c99643..e299b09 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/CorpInfoDO.java
@@ -187,6 +187,15 @@ public class CorpInfoDO extends BaseDO {
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
+ //隶属关系编码
+ @ApiModelProperty(value = "隶属关系编码")
+ private String subordination;
+ //隶属关系名称
+ @ApiModelProperty(value = "隶属关系名称")
+ private String subordinationName;
+ //四色图类型，1.平面四色图
+ @ApiModelProperty(value = "四色图类型，1.平面四色图")
+ private String fourtype;
//有无职业卫生信息,1:是,2:否
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
private Integer whetherHygiene;