Merge branch 'master' into test

device-api-service/src/main/java/com/xy/entity/DeviceAlgorithmChargingHistory.java

@@ -64,5 +64,5 @@ public class DeviceAlgorithmChargingHistory implements Serializable {
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "备注")
-    private String node;
+    private String note;
 }

device-api-service/src/main/java/com/xy/entity/DeviceChargingHistory.java

@@ -57,5 +57,5 @@ public class DeviceChargingHistory extends BaseEntity<DeviceChargingHistory> imp
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "备注")
-    private String node;
+    private String note;
 }

device-api-service/src/main/java/com/xy/service/DeviceAlgorithmChargingServiceImpl.java

@@ -109,7 +109,7 @@ public class DeviceAlgorithmChargingServiceImpl extends ServiceImpl<DeviceAlgori
                     .setChargingType(pay.getPayType())
                     .setCreateTime(now)
                     .setUpdateTime(now)
-                    .setNode(pay.getNode());
+                    .setNote(pay.getNote());
             deviceAlgorithmChargingHistories.add(deviceAlgorithmChargingHistory);
         });
         //添加设备算法计费历史表

device-api-service/src/main/java/com/xy/service/DeviceChargingServiceImpl.java

@@ -224,7 +224,7 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                     .setStandard(deviceCharging.getStandard())
                     .setCreateTime(now)
                     .setUpdateTime(now)
-                    .setNode(pay.getNode());
+                    .setNote(pay.getNote());
             deviceChargingHistories.add(deviceChargingHistory);
         });
         if (!Emptys.check(deviceChargingHistories)) {

device-api/src/main/java/com/xy/dto/DeviceAlgorithmChargingDto.java

@@ -61,7 +61,7 @@ public class DeviceAlgorithmChargingDto {
         private List<DeviceAlgorithmCharging> deviceAlgorithmChargings;
 
         @ApiModelProperty(value = "备注")
-        private String node;
+        private String note;
 
         @Data
         @Accessors(chain = true)

device-api/src/main/java/com/xy/dto/DeviceAlgorithmChargingHistoryDto.java

@@ -71,7 +71,7 @@ public class DeviceAlgorithmChargingHistoryDto {
         private LocalDateTime updateTime;
 
         @ApiModelProperty(value = "备注")
-        private String node;
+        private String note;
     }
 
 }

device-api/src/main/java/com/xy/dto/DeviceChargingDto.java

@@ -93,7 +93,7 @@ public class DeviceChargingDto {
         private Integer payType;
 
         @ApiModelProperty(value = "备注")
-        private String node;
+        private String note;
 
         @Data
         @Accessors(chain = true)

device-api/src/main/java/com/xy/dto/DeviceChargingHistoryDto.java

@@ -58,7 +58,7 @@ public class DeviceChargingHistoryDto {
         private LocalDateTime updateTime;
 
         @ApiModelProperty(value = "备注")
-        private String node;
+        private String note;
     }
 
     @Data