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

zss

5 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

 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;