Pārlūkot izejas kodu

Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!511
jiang hao 2 gadi atpakaļ
vecāks
revīzija
21a2476282

+ 1 - 1
mp-service/src/main/java/com/qs/mp/admin/domain/excel/ChannelExcel.java

@@ -27,7 +27,7 @@ public class ChannelExcel {
     @Excel(name = "经销商认证状态")
     private String certifyStatus;
 
-    @Excel(name = "经销商佣金比例")
+    @Excel(name = "经销商佣金比例(%)")
     private BigDecimal commRate;
 
     @Excel(name = "上级渠道")

+ 2 - 2
mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderItemExcel.java

@@ -29,10 +29,10 @@ public class UserTicketOrderItemExcel {
     @Excel(name = "盲票类型")
     private String ticketType;
 
-    @Excel(name = "盲票售价")
+    @Excel(name = "盲票售价(元)")
     private BigDecimal salePrice;
 
-    @Excel(name = "佣金系数")
+    @Excel(name = "佣金系数(%)")
     private BigDecimal saleCommRate;
 
     @Excel(name = "盲票状态")