Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 79c1cc71dfcf2ac2a96433439507e582b7bf23e2

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpMaintenanceReminder.java

@@ -38,9 +38,9 @@
    @TableField("maintenance_type")
    private Integer maintenanceType;

    @ApiModelProperty(value = "入库id")
    @TableField("warehousing_id")
    private String warehousingId;
    @ApiModelProperty(value = "入库批次id")
    @TableField("warehousing_batch_id")
    private String warehousingBatchId;

    @ApiModelProperty(value = "状态 1=未维护 2=已维护")
    @TableField("status")