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

liyong

9 天以前 a5d7ef82a926d72651bb35779a59883528a9d641

 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;