Wang yingyang

fix not serve

...@@ -301,7 +301,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -301,7 +301,7 @@ public class OrderServiceImpl implements OrderService {
301 .adjustSkuRemark(d.getAdjustSkuRemark()) 301 .adjustSkuRemark(d.getAdjustSkuRemark())
302 .enterpriseId(d.getEnterpriseId()) 302 .enterpriseId(d.getEnterpriseId())
303 .skuId(d.getSkuId()) 303 .skuId(d.getSkuId())
304 - .s(d.getNotServe()) 304 + .serveStatus(d.getserveStatus())
305 .creationSource(d.getCreationSource().getNumber()) 305 .creationSource(d.getCreationSource().getNumber())
306 .createdBy(d.getCreatedBy()) 306 .createdBy(d.getCreatedBy())
307 .createdAt(DateUtil.formatDate(d.getCreatedAt())) 307 .createdAt(DateUtil.formatDate(d.getCreatedAt()))
...@@ -374,7 +374,7 @@ public class OrderServiceImpl implements OrderService { ...@@ -374,7 +374,7 @@ public class OrderServiceImpl implements OrderService {
374 .adjustSkuRemark(d.getAdjustSkuRemark()) 374 .adjustSkuRemark(d.getAdjustSkuRemark())
375 .enterpriseId(d.getEnterpriseId()) 375 .enterpriseId(d.getEnterpriseId())
376 .skuId(d.getSkuId()) 376 .skuId(d.getSkuId())
377 - .notServe(d.getNotServe()) 377 + .serveStatus(d.getServeStatus())
378 .creationSource(d.getCreationSource().getNumber()) 378 .creationSource(d.getCreationSource().getNumber())
379 .createdBy(d.getCreatedBy()) 379 .createdBy(d.getCreatedBy())
380 .createdAt(DateUtil.formatDate(d.getCreatedAt())) 380 .createdAt(DateUtil.formatDate(d.getCreatedAt()))
......