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
56db2a13
Commit
56db2a13
authored
Nov 09, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
dd991f3a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
BranchCompany.java
...m/github/wxiaoqi/security/admin/entity/BranchCompany.java
+1
-6
CompanyInfo.java
...com/github/wxiaoqi/security/admin/entity/CompanyInfo.java
+9
-0
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BranchCompany.java
View file @
56db2a13
...
@@ -202,10 +202,5 @@ public class BranchCompany {
...
@@ -202,10 +202,5 @@ public class BranchCompany {
@Column
(
name
=
"give_num"
)
@Column
(
name
=
"give_num"
)
private
Integer
giveNum
;
private
Integer
giveNum
;
public
String
getHeadLogo
(){
if
(
StringUtils
.
isBlank
(
headLogo
)){
headLogo
=
"https://chwplatform.upyuns.com/image/app/shop_logo_default.png"
;
}
return
headLogo
;
}
}
}
\ No newline at end of file
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/CompanyInfo.java
View file @
56db2a13
...
@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.entity;
...
@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.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
;
...
@@ -207,4 +208,12 @@ public class CompanyInfo {
...
@@ -207,4 +208,12 @@ public class CompanyInfo {
@ApiModelProperty
(
"公司地址-经度"
)
@ApiModelProperty
(
"公司地址-经度"
)
private
BigDecimal
longitude
;
private
BigDecimal
longitude
;
public
String
getHeadLogo
(){
if
(
StringUtils
.
isBlank
(
headLogo
)){
headLogo
=
"https://chwplatform.upyuns.com/image/app/shop_logo_default.png"
;
}
return
headLogo
;
}
}
}
\ 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