Merge branch 'dev_New_pro' into dev_山西_黎城康森商砼

云

2026-07-08 92eb695ac1254708feb6e740432fc5da9e1ad42b

 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;