Merge branch 'master' into test

pom.xml

@@ -207,7 +207,7 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>RELEASE</version>
+			<version>4.4.0</version>
 		</dependency>
 		<!--定时任务-->
 <!--		<dependency>-->
@@ -220,11 +220,11 @@
 			<artifactId>spring-boot-starter</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.projectlombok</groupId>-->
+<!--			<artifactId>lombok</artifactId>-->
+<!--			<optional>true</optional>-->
+<!--		</dependency>-->
 		<!--<dependency>-->
 			<!--<groupId>org.springframework.boot</groupId>-->
 			<!--<artifactId>spring-boot-starter-test</artifactId>-->

src/main/java/com/szwl/model/entity/TOrder.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import java.util.List;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,7 +21,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-06-14
+ * @since 2023-08-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -137,6 +136,8 @@ public class TOrder implements Serializable {
 
     private BigDecimal marketingAmount;
 
+    private String coupons;
+
     @ApiModelProperty(value = "退款营销金额")
     private BigDecimal refundMarketingAmount;
 
@@ -158,4 +159,8 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "退款数量")
     private Integer refundQuantity;
 
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
+
+
 }