Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/constants/enums/dict/InsInsuranceKind.java

@@ -11,11 +11,11 @@ import lombok.Getter;
 public enum InsInsuranceKind implements IBaseEnum{
 
 
-    A("A", "车损","机动车损失险"),
+    A("A", "单商","机动车损失险"),
 
-    TRAFFIC("0507", "交强", "机动车交通事故责任强制保险"),
+    TRAFFIC("0507", "单交", "机动车交通事故责任强制保险"),
 
-    BUSINESS("0510", "商业", "机动车商业保险");
+    BUSINESS("0510", "单三", "机动车商业保险");
 
 
     private final String code;

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementSaveDto.java

@@ -73,4 +73,7 @@ public class PtlAgreementSaveDto implements Serializable {
 
     @ApiModelProperty("审核方式")
     private Integer auditType;
+
+    @ApiModelProperty("内部机构id")
+    private String deptId;
 }

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -76,6 +76,12 @@ public class PtlAgreement implements Serializable {
     @TableField(value = "partner_companies_id")
     private String partnerCompaniesId;
 
+    /**
+     * 内部机构 id
+     */
+    @TableField(value = "dept_id")
+    private String deptId;
+
     /**
      * 保险公司id
      */

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreementHistory.java

@@ -95,6 +95,12 @@ public class PtlAgreementHistory implements Serializable {
     @TableField(value = "association_companies_id")
     private String associationCompaniesId;
 
+    /**
+     * 内部机构id
+     */
+    @TableField(value = "dept_id")
+    private String deptId;
+
     /**
      * 关联-保险公司
      */

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -53,7 +53,7 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("合作公司id")
     private String partnerCompaniesId;
 
-    @ApiModelProperty("是否有效 0 无效 1 有效 2 待审核")
+    @ApiModelProperty("是否启用 0 禁用 1 启用 ")
     private String validStatus;
 
     @ApiModelProperty("审核状态 0 申请审核 1 审核通过 2 审核不通过")