ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
@@ -60,7 +60,12 @@ @ApiModelProperty(value = "上架状态（0=否，1=是）") @TableField("status") private Integer status; @ApiModelProperty(value = "小程序id") @TableField("applet_id") private String appletId; @ApiModelProperty(value = "小程序名称") @TableField("applet_name") private String appletName; @ApiModelProperty(value = "活动状态 1未开始 2已开始 3已结束") @TableField(exist = false) private Integer startState; ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1907,7 +1907,7 @@ tSettlementConfirm.setVenue(dto.getVenue()); tSettlementConfirm.setMetering(dto.getMetering()); tSettlementConfirm.setClean(dto.getClean()); tSettlementConfirm.setLossElectronic(dto.getLossElectronic()); tSettlementConfirm.setLossElectronic(dto.getMeteringElectronic().subtract(dto.getChargingElectronic())); tSettlementConfirm.setMaintain(dto.getMaintain()); tSettlementConfirm.setMeteringElectronic(dto.getMeteringElectronic());
