Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charg...

puzhibing

2024-09-11 6958348fad1f68342235a7df57f10f348582c843

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

# Conflicts:
#	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TSettlementConfirm.java

@@ -25,14 +25,14 @@
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_settlement confirm")
@TableName("t_settlement_confirm")
@ApiModel(value="TSettlementConfirm对象", description="")
public class TSettlementConfirm extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    @TableId(value = "id")
    private Long id;

    @ApiModelProperty(value = "站点id")
@@ -58,7 +58,7 @@
    @TableField("loss_electronic")
    private BigDecimal lossElectronic;
    @ApiModelProperty(value = "收入合计")
    @TableField("收入合计")
    @TableField("income")
    private BigDecimal income;

    @ApiModelProperty(value = "场地费")