Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PayParam.java

@@ -23,4 +23,6 @@
    private Integer subscribeChargingCapacity;

    private String outTradeNo;

    private Long orderId;
}