Merge remote-tracking branch 'origin/sqd' into sqd

maven

4 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

 src/main/java/com/ruoyi/device/pojo/DeviceRepair.java

@@ -25,6 +25,13 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;

    @ApiModelProperty("报修金额")
    private BigDecimal repairPrice;

    private String deviceName;

    private String deviceModel;

    @ApiModelProperty("报修时间")
    private Date repairTime;