Merge branch 'dev_local' into dev

# 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:
2023-11-21 11:31:42 +08:00
39 changed files with 578 additions and 148 deletions

View File

@@ -48,6 +48,11 @@ public class UpdateMemberBalanceDTO {
*/
private String relatedOrderCode;
/**
* 充值目标运营商id
*/
private String targetMerchantId;
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)