Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
Java CI with Maven / build (11) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled

This commit is contained in:
2025-11-19 16:59:31 +08:00
8 changed files with 8 additions and 9 deletions

View File

@@ -29,7 +29,7 @@ import cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo.*;
import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO; import cn.iocoder.yudao.module.erp.dal.dataobject.devicecategory.DeviceCategoryDO;
import cn.iocoder.yudao.module.erp.service.devicecategory.DeviceCategoryService; import cn.iocoder.yudao.module.erp.service.devicecategory.DeviceCategoryService;
@Tag(name = "管理后台 - 进销存系统 - 器械分类") @Tag(name = "管理后台 - 器械分类")
@RestController @RestController
@RequestMapping("/erp/device-category") @RequestMapping("/erp/device-category")
@Validated @Validated

View File

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 进销存系统 - 器械分类分页 Request VO") @Schema(description = "管理后台 - 器械分类分页 Request VO")
@Data @Data
public class DeviceCategoryPageReqVO extends PageParam { public class DeviceCategoryPageReqVO extends PageParam {

View File

@@ -7,7 +7,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import cn.idev.excel.annotation.*; import cn.idev.excel.annotation.*;
@Schema(description = "管理后台 - 进销存系统 - 器械分类 Response VO") @Schema(description = "管理后台 - 器械分类 Response VO")
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class DeviceCategoryRespVO { public class DeviceCategoryRespVO {

View File

@@ -5,7 +5,7 @@ import lombok.*;
import java.util.*; import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO") @Schema(description = "管理后台 - 器械分类新增/修改 Request VO")
@Data @Data
public class DeviceCategorySaveReqVO { public class DeviceCategorySaveReqVO {

View File

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/** /**
* 进销存系统 - 器械分类 DO * 器械分类 DO
* *
* @author 芋道源码 * @author 芋道源码
*/ */

View File

@@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageParam;
/** /**
* 进销存系统 - 器械分类 Service 接口 * 器械分类 Service 接口
* *
* @author 芋道源码 * @author 芋道源码
*/ */

View File

@@ -1,5 +1,4 @@
import request from '@/config/axios' import request from '@/config/axios'
import type { Dayjs } from 'dayjs';
/** 进销存系统 - 器械分类信息 */ /** 进销存系统 - 器械分类信息 */
export interface DeviceCategory { export interface DeviceCategory {