Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2 天以前 372d212912401059defe5fe83379c50d1033c06e

 src/main/java/com/ruoyi/common/enums/BaseEnum.java

@@ -1,6 +1,7 @@
package com.ruoyi.common.enums;


import com.baomidou.mybatisplus.annotation.EnumValue;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue;