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

云

10 天以前 39e6d6469b652daaf4af66b8b75f8dad2f95923c

 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;