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

无关风月

3 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

 cloud-server-activity/src/main/java/com/dsh/activity/entity/TPayHuimin.java

@@ -80,7 +80,7 @@
    @TableField("status")
    private Integer status;
    /**
     *付款方式1微信2支付宝
     *付款方式1微信2支付宝 3后台录入
     */
    @TableField("paymentType")
    private Integer paymentType;