Commit df29b3e94b6ede0efedd74bfe34473b7c9a99230
Merge branch 'fix-main-ch' into 'main'
add 校验 See merge request !5
Showing
2 changed files
with
6 additions
and
4 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
| ... | ... | @@ -1706,9 +1706,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O |
| 1706 | 1706 | .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId())); |
| 1707 | 1707 | OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo(); |
| 1708 | 1708 | if (Objects.nonNull(inspectionStageDO)) { |
| 1709 | - if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) { | |
| 1710 | - inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime()); | |
| 1711 | - } | |
| 1709 | +// if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckApplyTime())) { | |
| 1710 | +// | |
| 1711 | +// } | |
| 1712 | + inspectionStageDO.setMidCheckApplyTime(inspectionStageInfo.getMidCheckApplyTime()); | |
| 1712 | 1713 | if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) { |
| 1713 | 1714 | inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment()); |
| 1714 | 1715 | } | ... | ... |
src/main/resources/application-prod.yml