系统码

This commit is contained in:
mamengke01
2021-02-05 11:56:18 +08:00
parent 286eb231a6
commit 98918b49db
-6
View File
@@ -386,14 +386,8 @@ export enum POPULATE_TYPE {
} }
export enum BLOCK_OPEATE { export enum BLOCK_OPEATE {
<<<<<<< HEAD
ADD = 1, ADD = 1,
REMOVE_BLACK = 2, REMOVE_BLACK = 2,
REMOVE_AND_APPLY = 3, REMOVE_AND_APPLY = 3,
REMOVE_FRIEND = 4 REMOVE_FRIEND = 4
=======
ADD = 1,
REMOVE = 2,
REMOVE_AND_APPLY = 3
>>>>>>> cf60d7c... 邮件 活跃度下发
} }