Merge branch 'hotfix' into test

src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -900,7 +900,7 @@ public class PrescriptionServices {
             String col6 = "支付渠道";
             String[] columns = new String[]{col0, col1, col2, col3, col4, col5, col6};
             request.setPaymentStatus(PaymentStatusEnum.Success.getValue() + "");
-            request.setPaymentChannel(PaymentChannelEnum.WeChat.getValue() + "");
+//            request.setPaymentChannel(PaymentChannelEnum.WeChat.getValue() + "");
             List<PrescriptionInfo> prescriptionInfoList = downloadPrescriptionlistNew(request);
             ExcelDataMap map = new ExcelDataMap(columns);
             Map<String, Integer> statisticalDataMap = new HashMap<>();