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

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/model/UserCoupon.java

@@ -29,6 +29,10 @@
     */
    private Integer verificationUserId;
    /**
     * 核销人员id
     */
    private Integer siteId;
    /**
     * 核销时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")