Merge remote-tracking branch 'origin/master'

doum

18 小时以前 a76e2318dd2731ff713df6e262396a9175d029f7

 server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -51,6 +51,10 @@

    public static final String MEMBER_PREFIX  = "member_";
    public static final String SHOP_PREFIX  = "shop_";
    public static final String PRIVACY_AGREEMENT = "PRIVACY_AGREEMENT";
    public static final String ABOUT_US = "ABOUT_US";
    public static final String SERVER_INTRODUCE = "SERVER_INTRODUCE";
    public static final String SERVER_PHONE ="SERVER_PHONE" ;

    /**
     * mq tag
@@ -357,6 +361,7 @@
        AFTERSALE_APPLY(8, "申请售后补充说明附件", "申请售后补充说明附件"),
        AFTERSALE_KD(9, "申请售后邮寄说明附件", "申请售后邮寄说明附件"),
        TRANSFER_FILE(10, "打款凭证", "打款凭证"),
        COMMENT_FILE(11, "评论附件", "评论附件"),
        ;
        // 成员变量
        private String name;