Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java

@@ -43,6 +43,8 @@
    private double rechargeDegree;
    private double rechargeMoney;

    private String degree;

    private List<MeterMachineSpecDto> specs;


@@ -263,4 +265,12 @@
    public void setRechargeMoney(double rechargeMoney) {
        this.rechargeMoney = rechargeMoney;
    }

    public String getDegree() {
        return degree;
    }

    public void setDegree(String degree) {
        this.degree = degree;
    }
}