diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 37198fe..e230ca4 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index 37198fe..e230ca4 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -37,7 +37,7 @@ bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time,csi.measure_type, bo.is_urgent,bo.plan_deliver_time,bo.require_over_time,bo.deliverer, - bosr.return_time + bosr.return_time,csi.remark FROM ( SELECT * diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java index a4b3d8d..8baf9b7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchVO.java @@ -104,6 +104,9 @@ @ApiModelProperty(value = "是否自检", dataType = "boolean") private Boolean isSelfMeasure; + @ApiModelProperty(value = "备注", dataType = "boolean") + private Boolean remark; + @JSONField(serialize = false) private Integer measureType;