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

核销校验提示

See merge request !2435

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/OrderListVO.java

@@ -107,7 +107,18 @@ public class OrderListVO implements Serializable {
      * 评价
      */
     private EvaluateVO evaluateVO;
-    
+
+    // 2 会员自主核销
+    private Integer deliveryOptType ;
+
+    public Integer getDeliveryOptType() {
+        return deliveryOptType;
+    }
+
+    public void setDeliveryOptType(Integer deliveryOptType) {
+        this.deliveryOptType = deliveryOptType;
+    }
+
     public Integer getUsePoint() {
         return usePoint;
     }