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

buhuazhen

6 天以前 4e833109c2105bf6895ac985205ce30da37c70d6

 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;