Merge branch 'master' into test

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

@@ -44,9 +44,6 @@ public class DeviceChargingHistory extends BaseEntity<DeviceChargingHistory> imp
     @ApiModelProperty(value = "续费方式")
     private Integer chargingType;
 
-    @ApiModelProperty(value = "计费标准 单位：分/年")
-    private Integer standard;
-
     @ApiModelProperty(value = "状态")
     private Integer status;
 

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

@@ -221,7 +221,6 @@ public class DeviceChargingServiceImpl extends ServiceImpl<DeviceChargingMapper,
                     .setChargingSize(deviceCharging.getNum())
                     .setChargingMoney(deviceCharging.getChargingMoney())
                     .setChargingType(payType)
-                    .setStandard(deviceCharging.getStandard())
                     .setCreateTime(now)
                     .setUpdateTime(now)
                     .setNote(pay.getNote());

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

@@ -105,9 +105,6 @@ public class DeviceChargingDto {
             @ApiModelProperty("购买年数/赠送天数")
             private Integer num;
 
-            @ApiModelProperty(value = "计费标准 单位：分/年")
-            private Integer standard;
-
             @ApiModelProperty("续费金额")
             private Integer chargingMoney;
         }

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

@@ -43,9 +43,6 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty(value = "续费方式")
         private Integer chargingType;
 
-        @ApiModelProperty(value = "计费标准 单位：分/年")
-        private Integer standard;
-
         @ApiModelProperty(value = "状态")
         private Integer status;