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

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

 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;

}