企业服务商表、平台服务商表新增字段

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwaccount/entity/HlwCompanySubcontractor.java

@@ -46,7 +46,12 @@ public class HlwCompanySubcontractor implements Serializable {
 	/**服务费率*/
 	@Excel(name = "服务费率", width = 15)
     @ApiModelProperty(value = "服务费率")
-    private java.math.BigDecimal serviceRate;
+    private Double serviceRate;
+
+    /**
+     * 服务合同（企业->服务商）
+     */
+	private String serviceContract;
 	/**创建时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/entity/HlwCpSubcontractor.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -21,47 +22,68 @@ import lombok.experimental.Accessors;
 /**
  * @Description: hlw_cp_subcontractor
  * @Author: jeecg-boot
- * @Date:   2020-07-20
+ * @Date: 2020-07-20
  * @Version: V1.0
  */
 @Data
 @TableName("hlw_cp_subcontractor")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="hlw_cp_subcontractor对象", description="hlw_cp_subcontractor")
+@ApiModel(value = "hlw_cp_subcontractor对象", description = "hlw_cp_subcontractor")
 public class HlwCpSubcontractor implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.AUTO)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;
-	/**平台id*/
-	@Excel(name = "平台id", width = 15)
+    /**
+     * 平台id
+     */
+    @Excel(name = "平台id", width = 15)
     @ApiModelProperty(value = "平台id")
     private Integer cpId;
-	/**服务商id*/
-	@Excel(name = "服务商id", width = 15)
+    /**
+     * 服务商id
+     */
+    @Excel(name = "服务商id", width = 15)
     @ApiModelProperty(value = "服务商id")
     private Integer subcontractorId;
-	/**服务费率*/
-	@Excel(name = "服务费率", width = 15)
+    /**
+     * 服务费率
+     */
+    @Excel(name = "服务费率", width = 15)
     @ApiModelProperty(value = "服务费率")
     private Double serviceRate;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+
+    /**
+     * 转包合同（多合同以逗号分隔）
+     */
+    private String subcontract;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-	/**创建者*/
+    /**
+     * 创建者
+     */
     @ApiModelProperty(value = "创建者")
     private String createBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    /**
+     * 更新时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
-	/**更新者*/
+    /**
+     * 更新者
+     */
     @ApiModelProperty(value = "更新者")
     private String updateBy;