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

gongchunyi

8 天以前 b3712bb9c618d3cb74b6a200fd83c2ba0577ac3d

 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;