Merge branch 'dev' into user_action

peng

7 天以前 b7df7af3289cabe6cf8a23f314d803fc144a913e

Merge branch 'dev' into user_action

 framework/src/main/java/cn/lili/modules/lmk/enums/general/MerchantTagTypeEnums.java

New file
@@ -0,0 +1,13 @@
package cn.lili.modules.lmk.enums.general;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public enum MerchantTagTypeEnums {
    SYSTEM("平台"),
    MERCHANT("商户");

    private String des;
}

 framework/src/main/java/cn/lili/modules/lmk/enums/general/MerchantVisibilityEnums.java

New file
@@ -0,0 +1,13 @@
package cn.lili.modules.lmk.enums.general;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public enum MerchantVisibilityEnums {
    CAN_VISIBILITY("商户可见"),
    NOT_VISIBILITY("商户不可见");

    private String des;
}