Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

9 天以前 e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831

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

@@ -159,4 +159,7 @@

    @ApiModelProperty("设备类型")
    private String type;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}