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

liyong

2026-05-26 33f9eae4ad4321860e4881f5f38dad6368c878ef

 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;