Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
f1f879b6
Commit
f1f879b6
authored
Nov 11, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步
parent
f833bb27
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
258 additions
and
4 deletions
+258
-4
BranchCompany.java
...in/java/com/xxfc/platform/order/entity/BranchCompany.java
+32
-0
CompanyInfo.java
...main/java/com/xxfc/platform/order/entity/CompanyInfo.java
+53
-0
BranchCompany.java
.../java/com/xxfc/platform/vehicle/entity/BranchCompany.java
+20
-2
CompanyInfo.java
...in/java/com/xxfc/platform/vehicle/entity/CompanyInfo.java
+153
-2
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BranchCompany.java
View file @
f1f879b6
package
com
.
xxfc
.
platform
.
order
.
entity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.persistence.Column
;
import
javax.persistence.GeneratedValue
;
...
...
@@ -34,10 +36,19 @@ public class BranchCompany {
private
String
name
;
@ApiModelProperty
(
"门头照"
)
@Column
(
name
=
"head_logo"
)
private
String
headLogo
;
@Column
(
name
=
"short_name"
)
@ApiModelProperty
(
"简称"
)
private
String
shortName
;
@Column
(
name
=
"business_scope"
)
@ApiModelProperty
(
"经营范围(逗号隔开)"
)
private
String
businessScope
;
/**
* 分支机构类型
*/
...
...
@@ -119,6 +130,18 @@ public class BranchCompany {
*/
@ApiModelProperty
(
"负责人联系方式"
)
private
String
leaderContactInfo
;
@ApiModelProperty
(
"邀请码"
)
private
String
code
;
@ApiModelProperty
(
"邀请人id"
)
@Column
(
name
=
"inviter_account"
)
private
Integer
inviterAccount
;
/**
* 分公司状态
*/
...
...
@@ -172,4 +195,13 @@ public class BranchCompany {
@Column
(
name
=
"is_del"
)
private
Integer
isDel
;
//浏览量
@Column
(
name
=
"browse_num"
)
private
Integer
browseNum
;
//点赞数量
@Column
(
name
=
"give_num"
)
private
Integer
giveNum
;
}
\ No newline at end of file
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/CompanyInfo.java
View file @
f1f879b6
...
...
@@ -3,12 +3,14 @@ package com.xxfc.platform.order.entity;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
javax.persistence.Column
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
java.math.BigDecimal
;
import
java.util.Date
;
@Data
...
...
@@ -27,6 +29,12 @@ public class CompanyInfo {
private
String
name
;
@ApiModelProperty
(
"门头照"
)
@Column
(
name
=
"head_logo"
)
private
String
headLogo
;
@ApiModelProperty
(
"公司类型:1-个体;2-企业"
)
private
Integer
type
;
...
...
@@ -62,6 +70,22 @@ public class CompanyInfo {
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
(
"营业执照"
)
@Column
(
name
=
"business_license"
)
private
String
businessLicense
;
...
...
@@ -144,6 +168,24 @@ public class CompanyInfo {
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"
)
private
Long
crtTime
;
...
...
@@ -156,4 +198,15 @@ public class CompanyInfo {
@Column
(
name
=
"is_del"
)
private
Integer
isDel
;
@ApiModelProperty
(
"公司地址-纬度"
)
private
BigDecimal
latitude
;
/**
* 公司地址-经度
*/
@ApiModelProperty
(
"公司地址-经度"
)
private
BigDecimal
longitude
;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompany.java
View file @
f1f879b6
package
com
.
xxfc
.
platform
.
vehicle
.
entity
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.persistence.Column
;
import
javax.persistence.GeneratedValue
;
...
...
@@ -34,6 +36,11 @@ public class BranchCompany {
private
String
name
;
@ApiModelProperty
(
"门头照"
)
@Column
(
name
=
"head_logo"
)
private
String
headLogo
;
@Column
(
name
=
"short_name"
)
@ApiModelProperty
(
"简称"
)
private
String
shortName
;
...
...
@@ -42,7 +49,6 @@ public class BranchCompany {
@Column
(
name
=
"business_scope"
)
@ApiModelProperty
(
"经营范围(逗号隔开)"
)
private
String
businessScope
;
/**
* 分支机构类型
*/
...
...
@@ -124,6 +130,18 @@ public class BranchCompany {
*/
@ApiModelProperty
(
"负责人联系方式"
)
private
String
leaderContactInfo
;
@ApiModelProperty
(
"邀请码"
)
private
String
code
;
@ApiModelProperty
(
"邀请人id"
)
@Column
(
name
=
"inviter_account"
)
private
Integer
inviterAccount
;
/**
* 分公司状态
*/
...
...
@@ -177,7 +195,6 @@ public class BranchCompany {
@Column
(
name
=
"is_del"
)
private
Integer
isDel
;
//浏览量
@Column
(
name
=
"browse_num"
)
private
Integer
browseNum
;
...
...
@@ -186,4 +203,5 @@ public class BranchCompany {
@Column
(
name
=
"give_num"
)
private
Integer
giveNum
;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/CompanyInfo.java
View file @
f1f879b6
package
com
.
xxfc
.
platform
.
vehicle
.
entity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
javax.persistence.Column
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
java.math.BigDecimal
;
import
java.util.Date
;
@Data
@Table
(
name
=
"company_info"
)
...
...
@@ -16,22 +22,45 @@ public class CompanyInfo {
@ApiModelProperty
(
"主键id"
)
private
Long
id
;
@ApiModelProperty
(
"app用户id"
)
@Column
(
name
=
"app_user_id"
)
private
Integer
appUserId
;
@ApiModelProperty
(
"公司名称"
)
private
String
name
;
@ApiModelProperty
(
"门头照"
)
@Column
(
name
=
"head_logo"
)
private
String
headLogo
;
@ApiModelProperty
(
"公司类型:1-个体;2-企业"
)
private
Integer
type
;
@ApiModelProperty
(
"法人姓名"
)
@Column
(
name
=
"legal_person"
)
private
String
legalPerson
;
@ApiModelProperty
(
"
公司名称
"
)
@ApiModelProperty
(
"
法人身份证
"
)
@Column
(
name
=
"legal_id_number"
)
private
String
legalIdNumber
;
@ApiModelProperty
(
"身份证正面"
)
@Column
(
name
=
"front_url"
)
private
String
frontUrl
;
@ApiModelProperty
(
"法人身份证反面"
)
@Column
(
name
=
"back_url"
)
private
String
backUrl
;
@ApiModelProperty
(
"联系人"
)
private
String
contact
;
...
...
@@ -42,11 +71,122 @@ public class CompanyInfo {
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
(
"营业执照"
)
@Column
(
name
=
"business_license"
)
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"
)
private
Long
crtTime
;
...
...
@@ -59,4 +199,15 @@ public class CompanyInfo {
@Column
(
name
=
"is_del"
)
private
Integer
isDel
;
@ApiModelProperty
(
"公司地址-纬度"
)
private
BigDecimal
latitude
;
/**
* 公司地址-经度
*/
@ApiModelProperty
(
"公司地址-经度"
)
private
BigDecimal
longitude
;
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment