Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-01 38f618f789b4062a51f1c8c608bb734d9e47b5ba

 src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.project.system.domain.SysUserDept;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.time.LocalDateTime;