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

zss

10 天以前 d406310fa4d79e99b825a3698ee60af2991c261c

 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;