Merge branch 'dev_New_pro' into dev_pro_山西长治

gongchunyi

2026-07-06 76dc7e5445218129cbdce8feef1eea4a82b3069b

 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;