Merge branch 'feature/xgh/2501零散迭代' into 'developer'

核销校验提示

See merge request !2434

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -482,7 +482,7 @@ public class GicOrderController {
         qdto.setPickUpStoreId(storeId);
         if (step == 4) {
             qdto.setWriteOffClerkId(clerkId);
-            qdto.setDeliveryOptType(1);
+            //qdto.setDeliveryOptType(1);
         }
         qdto.setOrderStep("" + step);
         qdto.setPageNum(1);