Merge remote-tracking branch 'origin/master'

sdjk-admin/src/main/java/com/miaxis/app/controller/order/OrderInfoController.java

@@ -1,31 +1,27 @@
 package com.miaxis.app.controller.order;
 
-import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.page.ResponsePageInfo;
-import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.order.domain.OrderInfo;
 import com.miaxis.order.dto.OrderInfoDto;
 import com.miaxis.order.service.IOrderInfoService;
-import com.miaxis.question.domain.QuestionCollection;
-import com.miaxis.question.dto.QuestionCollectionDTO;
-import com.miaxis.question.dto.QuestionCollectionListDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
 /**
- * 【ad】Controller
+ * 【order】Controller
  *
  * @author miaxis
  * @date 2021-08-19

sdjk-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -65,4 +65,13 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "交易成功时间")
     private Date successTime;
 
+    /** 交易成功时间 */
+    @Excel(name = "佣金")
+    @TableField("commission_price")
+    @ApiModelProperty(value = "佣金")
+    private Integer commissionPrice;
+
+
+
+
 }