autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into merge_adapay

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
This commit is contained in:
autumn.g@foxmail.com
2023-08-29 17:03:24 +08:00
parent ae578eada7 a90fc4f9f3
commit 90539edf60
26 changed files with 468 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
View File

@@ -255,16 +255,19 @@ public class PileStationInfo extends BaseEntity {
/**
* 是否对外开放 （0-否；1-是）
*/
@Excel(name = "是否对外开放 （0-否；1-是）")
private String publicFlag;
/**
* 是否营业中（0-否；1-是）
*/
@Excel(name = "是否营业中（0-否；1-是）")
private String openFlag;
/**
* 是否对接高德（0-否；1-是）
*/
@Excel(name = "是否对接高德（0-否；1-是）")
private String aMapFlag;
/**