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

buhuazhen

6 天以前 5ddc232b8dffcb3402711874491df35fb1997d1d

 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;