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

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailPageReqVO.java

@@ -27,6 +27,9 @@ public class DeviceUseRecordDetailPageReqVO extends PageParam {
     @Schema(description = "样品编号")
     private String sampleCode;
 
+    @Schema(description = "明细数据类型")
+    private String detailType;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailRespVO.java

@@ -35,6 +35,10 @@ public class DeviceUseRecordDetailRespVO {
     @ExcelProperty("样品编号")
     private String sampleCode;
 
+    @Schema(description = "明细数据类型")
+    @ExcelProperty("明细数据类型")
+    private String detailType;
+
     @Schema(description = "所属部门")
     @ExcelProperty("所属部门")
     private String systemDepartmentCode;

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordDetailSaveReqVO.java

@@ -25,6 +25,9 @@ public class DeviceUseRecordDetailSaveReqVO {
     @Schema(description = "样品编号")
     private String sampleCode;
 
+    @Schema(description = "明细数据类型")
+    private String detailType;
+
     @Schema(description = "所属部门")
     private String systemDepartmentCode;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/dataobject/DeviceUseRecordDetailDO.java

@@ -53,6 +53,11 @@ public class DeviceUseRecordDetailDO extends BusinessBaseDO {
     */
     @TableField("SMP_CD")
     private String sampleCode;
+    /**
+     * 明细数据类型
+     */
+    @TableField("DTL_TY")
+    private String detailType;
     /**
     * 所属部门
     */