Commit f1f879b6 authored by hezhen's avatar hezhen

修改同步

parent f833bb27
package com.xxfc.platform.order.entity; package com.xxfc.platform.order.entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
...@@ -34,10 +36,19 @@ public class BranchCompany { ...@@ -34,10 +36,19 @@ public class BranchCompany {
private String name; private String name;
@ApiModelProperty("门头照")
@Column(name = "head_logo")
private String headLogo;
@Column(name = "short_name") @Column(name = "short_name")
@ApiModelProperty("简称") @ApiModelProperty("简称")
private String shortName; private String shortName;
@Column(name = "business_scope")
@ApiModelProperty("经营范围(逗号隔开)")
private String businessScope;
/** /**
* 分支机构类型 * 分支机构类型
*/ */
...@@ -119,6 +130,18 @@ public class BranchCompany { ...@@ -119,6 +130,18 @@ public class BranchCompany {
*/ */
@ApiModelProperty("负责人联系方式") @ApiModelProperty("负责人联系方式")
private String leaderContactInfo; private String leaderContactInfo;
@ApiModelProperty("邀请码")
private String code;
@ApiModelProperty("邀请人id")
@Column(name = "inviter_account")
private Integer inviterAccount;
/** /**
* 分公司状态 * 分公司状态
*/ */
...@@ -172,4 +195,13 @@ public class BranchCompany { ...@@ -172,4 +195,13 @@ public class BranchCompany {
@Column(name = "is_del") @Column(name = "is_del")
private Integer isDel; private Integer isDel;
//浏览量
@Column(name = "browse_num")
private Integer browseNum;
//点赞数量
@Column(name = "give_num")
private Integer giveNum;
} }
\ No newline at end of file
...@@ -3,12 +3,14 @@ package com.xxfc.platform.order.entity; ...@@ -3,12 +3,14 @@ package com.xxfc.platform.order.entity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@Data @Data
...@@ -27,6 +29,12 @@ public class CompanyInfo { ...@@ -27,6 +29,12 @@ public class CompanyInfo {
private String name; private String name;
@ApiModelProperty("门头照")
@Column(name = "head_logo")
private String headLogo;
@ApiModelProperty("公司类型:1-个体;2-企业") @ApiModelProperty("公司类型:1-个体;2-企业")
private Integer type; private Integer type;
...@@ -62,6 +70,22 @@ public class CompanyInfo { ...@@ -62,6 +70,22 @@ public class CompanyInfo {
private String mobile; private String mobile;
@ApiModelProperty("联系人身份证")
@Column(name = "contact_number")
private String contactNumber;
@ApiModelProperty("联系人身份证正面")
@Column(name = "contact_front_url")
private String contactFrontUrl;
@ApiModelProperty("联系人身份证反面")
@Column(name = "contact_back_url")
private String contactBackUrl;
@ApiModelProperty("营业执照") @ApiModelProperty("营业执照")
@Column(name = "business_license") @Column(name = "business_license")
private String businessLicense; private String businessLicense;
...@@ -144,6 +168,24 @@ public class CompanyInfo { ...@@ -144,6 +168,24 @@ public class CompanyInfo {
private String registerCode; private String registerCode;
@Column(name = "bank_account")
@ApiModelProperty("银行账号")
private String bankAccount;
@Column(name = "bank_name")
@ApiModelProperty("开户名")
private String bankName;
@Column(name = "bank")
@ApiModelProperty("开户行")
private String bank;
@Column(name = "crt_time") @Column(name = "crt_time")
private Long crtTime; private Long crtTime;
...@@ -156,4 +198,15 @@ public class CompanyInfo { ...@@ -156,4 +198,15 @@ public class CompanyInfo {
@Column(name = "is_del") @Column(name = "is_del")
private Integer isDel; private Integer isDel;
@ApiModelProperty("公司地址-纬度")
private BigDecimal latitude;
/**
* 公司地址-经度
*/
@ApiModelProperty("公司地址-经度")
private BigDecimal longitude;
} }
\ No newline at end of file
package com.xxfc.platform.vehicle.entity; package com.xxfc.platform.vehicle.entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
...@@ -34,6 +36,11 @@ public class BranchCompany { ...@@ -34,6 +36,11 @@ public class BranchCompany {
private String name; private String name;
@ApiModelProperty("门头照")
@Column(name = "head_logo")
private String headLogo;
@Column(name = "short_name") @Column(name = "short_name")
@ApiModelProperty("简称") @ApiModelProperty("简称")
private String shortName; private String shortName;
...@@ -42,7 +49,6 @@ public class BranchCompany { ...@@ -42,7 +49,6 @@ public class BranchCompany {
@Column(name = "business_scope") @Column(name = "business_scope")
@ApiModelProperty("经营范围(逗号隔开)") @ApiModelProperty("经营范围(逗号隔开)")
private String businessScope; private String businessScope;
/** /**
* 分支机构类型 * 分支机构类型
*/ */
...@@ -124,6 +130,18 @@ public class BranchCompany { ...@@ -124,6 +130,18 @@ public class BranchCompany {
*/ */
@ApiModelProperty("负责人联系方式") @ApiModelProperty("负责人联系方式")
private String leaderContactInfo; private String leaderContactInfo;
@ApiModelProperty("邀请码")
private String code;
@ApiModelProperty("邀请人id")
@Column(name = "inviter_account")
private Integer inviterAccount;
/** /**
* 分公司状态 * 分公司状态
*/ */
...@@ -177,7 +195,6 @@ public class BranchCompany { ...@@ -177,7 +195,6 @@ public class BranchCompany {
@Column(name = "is_del") @Column(name = "is_del")
private Integer isDel; private Integer isDel;
//浏览量 //浏览量
@Column(name = "browse_num") @Column(name = "browse_num")
private Integer browseNum; private Integer browseNum;
...@@ -186,4 +203,5 @@ public class BranchCompany { ...@@ -186,4 +203,5 @@ public class BranchCompany {
@Column(name = "give_num") @Column(name = "give_num")
private Integer giveNum; private Integer giveNum;
} }
\ No newline at end of file
package com.xxfc.platform.vehicle.entity; package com.xxfc.platform.vehicle.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.math.BigDecimal;
import java.util.Date;
@Data @Data
@Table(name = "company_info") @Table(name = "company_info")
...@@ -16,22 +22,45 @@ public class CompanyInfo { ...@@ -16,22 +22,45 @@ public class CompanyInfo {
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
private Long id; private Long id;
@ApiModelProperty("app用户id")
@Column(name = "app_user_id")
private Integer appUserId;
@ApiModelProperty("公司名称") @ApiModelProperty("公司名称")
private String name; private String name;
@ApiModelProperty("门头照")
@Column(name = "head_logo")
private String headLogo;
@ApiModelProperty("公司类型:1-个体;2-企业")
private Integer type;
@ApiModelProperty("法人姓名") @ApiModelProperty("法人姓名")
@Column(name = "legal_person") @Column(name = "legal_person")
private String legalPerson; private String legalPerson;
@ApiModelProperty("公司名称") @ApiModelProperty("法人身份证")
@Column(name = "legal_id_number") @Column(name = "legal_id_number")
private String legalIdNumber; private String legalIdNumber;
@ApiModelProperty("身份证正面")
@Column(name = "front_url")
private String frontUrl;
@ApiModelProperty("法人身份证反面")
@Column(name = "back_url")
private String backUrl;
@ApiModelProperty("联系人") @ApiModelProperty("联系人")
private String contact; private String contact;
...@@ -42,11 +71,122 @@ public class CompanyInfo { ...@@ -42,11 +71,122 @@ public class CompanyInfo {
private String mobile; private String mobile;
@ApiModelProperty("联系人身份证")
@Column(name = "contact_number")
private String contactNumber;
@ApiModelProperty("联系人身份证正面")
@Column(name = "contact_front_url")
private String contactFrontUrl;
@ApiModelProperty("联系人身份证反面")
@Column(name = "contact_back_url")
private String contactBackUrl;
@ApiModelProperty("营业执照") @ApiModelProperty("营业执照")
@Column(name = "business_license") @Column(name = "business_license")
private String businessLicense; private String businessLicense;
@ApiModelProperty("合同s,逗号隔开")
@Column(name = "contract_imgs")
private String contractImgs;
/**
* 地址-省/直辖市(编码)
*/
@Column(name = "addr_province")
@ApiModelProperty("地址-省/直辖市(编码)")
private Integer addrProvince;
/**
* 地址-省/直辖市(编码)名称
*/
@Column(name = "province_name")
@ApiModelProperty("地址-省/直辖市(编码)名称")
private String provinceName;
/**
* 地址-市(编码)
*/
@Column(name = "addr_city")
@ApiModelProperty("地址-市(编码)")
private Integer addrCity;
/**
* 地址-市(编码)名称
*/
@Column(name = "city_name")
@ApiModelProperty("地址-市(编码名称")
private String cityName;
/**
* 地址-镇/县(编码)
*/
@Column(name = "addr_town")
@ApiModelProperty("地址-镇/县(编码)")
private Integer addrTown;
/**
* 地址-县名称
*/
@Column(name = "town_name")
@ApiModelProperty("县名称")
private String townName;
/**
* 详细地址
*/
@Column(name = "addr_detail")
@ApiModelProperty("详细地址")
private String addrDetail;
@ApiModelProperty("成立日期")
@Column(name = "open_date")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyyMMdd",timezone="GMT+8")
private Date openDate;
@ApiModelProperty("营业执照有效期")
@Column(name = "license_date")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyyMMdd",timezone="GMT+8")
private Date licenseDate;
@Column(name = "register_code")
@ApiModelProperty("统一社会信用代码/注册号")
private String registerCode;
@Column(name = "bank_account")
@ApiModelProperty("银行账号")
private String bankAccount;
@Column(name = "bank_name")
@ApiModelProperty("开户名")
private String bankName;
@Column(name = "bank")
@ApiModelProperty("开户行")
private String bank;
@Column(name = "crt_time") @Column(name = "crt_time")
private Long crtTime; private Long crtTime;
...@@ -59,4 +199,15 @@ public class CompanyInfo { ...@@ -59,4 +199,15 @@ public class CompanyInfo {
@Column(name = "is_del") @Column(name = "is_del")
private Integer isDel; private Integer isDel;
@ApiModelProperty("公司地址-纬度")
private BigDecimal latitude;
/**
* 公司地址-经度
*/
@ApiModelProperty("公司地址-经度")
private BigDecimal longitude;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment