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

Merge branch 'dev_local' into dev

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
This commit is contained in:
autumn.g@foxmail.com
2023-11-21 11:31:42 +08:00
parent f3f67ddace de57827206
commit 342b6e4c26
39 changed files with 578 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java
View File

@@ -28,4 +28,6 @@ public class QueryMemberInfoDTO {
private List<String> merchantDeptIds;
private String vinCode;
private List<String> firstMerchantIds;
}