canrd-outside / order-erp · Commits

Commit df29b3e94b6ede0efedd74bfe34473b7c9a99230

Authored by chwork
2 parents af9f5d3b 5bd631bb
build: skipped

Merge branch 'fix-main-ch' into 'main' 

add 校验



See merge request !5
Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @df29b3e
@@ -1706,9 +1706,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -1706,9 +1706,10 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
1706 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId())); 1706 .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
1707 OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo(); 1707 OrderInspectionStageVO inspectionStageInfo = updateVO.getInspectionStageInfo();
1708 if (Objects.nonNull(inspectionStageDO)) { 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 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) { 1713 if (StringUtils.isNotBlank(inspectionStageInfo.getMidCheckComment())) {
1713 inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment()); 1714 inspectionStageDO.setMidCheckComment(inspectionStageInfo.getMidCheckComment());
1714 } 1715 }
src/main/resources/application-prod.yml
  View file @df29b3e
@@ -164,7 +164,8 @@ openai: @@ -164,7 +164,8 @@ openai:
164 # 文件存储路径 164 # 文件存储路径
165 file: 165 file:
166 path: /home/canrd/order-erp/files/ 166 path: /home/canrd/order-erp/files/
167 - host: http://47.104.8.35 167 +# host: http://47.104.8.35
  168 + host: http://39.108.227.113
168 avatar: /home/order-erp/avatar/ 169 avatar: /home/order-erp/avatar/
169 # 文件大小 /M 170 # 文件大小 /M
170 maxSize: 100 171 maxSize: 100