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

无关风月

3 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java

@@ -62,7 +62,7 @@
    private String rotate;

    @ApiModelProperty("回收补贴价")
    @TableField("sys_recovery_serve")
    private BigDecimal sysRecoveryServe;
    @TableField("recycle_subsidy")
    private BigDecimal recycleSubsidy;

}