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

liyong

5 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java

@@ -137,4 +137,16 @@
    @TableField(fill = FieldFill.INSERT)
    private Long tenantId;


    @ApiModelProperty("单位")
    private String unit;

    @ApiModelProperty("部门id")
    private Long deptId;

    @ApiModelProperty("安装位置")
    private String instationLocation;

    private String cycle;

}