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

优化

See merge request quanshu/mp-server!497

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserTicketOrderMgrController.java

@@ -138,10 +138,10 @@ public class UserTicketOrderMgrController extends BaseApiController {
                 userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getSalePrice()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
             }
             if (Objects.nonNull(userTicketOrderListVO.getDiscountAmt())) {
-                userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getDiscountAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+                userTicketOrderExcel.setDiscountAmt(new BigDecimal(userTicketOrderListVO.getDiscountAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
             }
             if (Objects.nonNull(userTicketOrderListVO.getPayAmt())) {
-                userTicketOrderExcel.setSalePrice(new BigDecimal(userTicketOrderListVO.getPayAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
+                userTicketOrderExcel.setPayAmt(new BigDecimal(userTicketOrderListVO.getPayAmt()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
             }
 
             if (Objects.nonNull(userTicketOrderListVO.getStatus())) {