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

liyong

2 天以前 5bea250f3d53b289e10d920ffd46aa6a0002cb7d

 src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java

@@ -157,7 +157,14 @@
     * 创建时间
     */
    private LocalDateTime createTime;

    /**
     * 设备报修id
     */
    private Long deviceRepairId;
    /**
     * 报修金额
     */
    private BigDecimal maintenancePrice;
    private static final long serialVersionUID = 1L;