Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

7 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserCouponPayment.java

@@ -61,4 +61,7 @@
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date insertTime;

    // 是否微信分账
    private Integer isFenZhang;
}