mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
# Conflicts: # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorInfo.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapConnectorStatusInfo.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPictures.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapPriceChargingInfo.java # jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
This commit is contained in:
@@ -1,14 +1,19 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 充电设备接口信息
|
||||
*/
|
||||
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapConnectorInfo {
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 高德地图充电枪状态
|
||||
@@ -9,6 +12,9 @@ import lombok.Data;
|
||||
* @author Lemon
|
||||
* @Date 2023/6/15 16:00
|
||||
*/
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapConnectorStatusInfo {
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@@ -11,6 +14,9 @@ import java.math.BigDecimal;
|
||||
* @author Lemon
|
||||
* @Date 2023/6/27 14:46
|
||||
*/
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapDiscountPriceChargingInfo {
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
@@ -9,7 +12,9 @@ import java.util.List;
|
||||
/**
|
||||
* 充电设备信息
|
||||
*/
|
||||
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapEquipmentInfo {
|
||||
// 设备唯一编码,对同一运营商,保证唯一
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
/**
|
||||
* 图片信息
|
||||
@@ -9,6 +12,9 @@ import lombok.Data;
|
||||
* @author Lemon
|
||||
* @Date 2023/6/27 14:48
|
||||
*/
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapPictures {
|
||||
// 图片ID
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@@ -11,6 +14,9 @@ import java.math.BigDecimal;
|
||||
* @author Lemon
|
||||
* @Date 2023/6/14 11:02
|
||||
*/
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapPriceChargingInfo {
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
package com.jsowell.thirdparty.amap.domain;
|
||||
|
||||
import com.alibaba.fastjson2.annotation.JSONField;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.List;
|
||||
@@ -9,7 +12,9 @@ import java.util.List;
|
||||
/**
|
||||
* 充电站信息
|
||||
*/
|
||||
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@Data
|
||||
public class AMapStationInfo {
|
||||
// 充电站ID 运营商自定义的唯一编码
|
||||
|
||||
Reference in New Issue
Block a user