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

buhuazhen

5 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

 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;