Merge remote-tracking branch 'origin/master'

Crunchy

2024-08-03 1a02af0b9943a11e2c8ab4e8665939437a7fbf16

 cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java

@@ -136,8 +136,11 @@
    private Boolean isItADataAcquisitionDevice;

    @ApiModelProperty("数采-委托字段")
    private String mdbEntrustCode;
    private String entrustCode;

    @ApiModelProperty("数采-样品字段")
    private String mdbSampleCode;
    private String sampleCode;

    @ApiModelProperty("数采-db，mdb文件名称")
    private String dbFileName;
}