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

云

15 小时以前 9683f8f2b526f67bff039a1cd46818808b53ab3e

 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;