Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/model/mobile/order/RefundOrderReq.java

@@ -0,0 +1,21 @@
+package com.ycwl.basic.model.mobile.order;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: songmingsong
+ * @CreateTime: 2024-12-06
+ * @Description: 退款
+ * @Version: 1.0
+ */
+@Data
+@ApiModel("退款请求参数")
+public class RefundOrderReq {
+    @ApiModelProperty("订单ID")
+    private Long orderId;
+    @ApiModelProperty("理由")
+    private String refundReason;
+}

src/main/java/com/ycwl/basic/model/wx/WechatMessageSubscribeForm.java

@@ -18,7 +18,10 @@ public class WechatMessageSubscribeForm {
      * 用户的openID
      */
     private String openId;
-
+    /**
+     * 消息模板
+     */
+    private String templateId;
     /**
      * 默认跳到小程序首页
      */