From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
index b0082b3..cd1a2d5 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/pojo/MeasuringInstrumentLedger.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,55 +18,55 @@
*/
@Data
@TableName("measuring_instrument_ledger")
-@ApiModel
+@Schema
public class MeasuringInstrumentLedger {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("闄勪欢id")
+ @Schema(description = "闄勪欢id")
@TableField(exist = false)
private List<String> tempFileIds;
@TableField(exist = false)
- @ApiModelProperty("闄勪欢鍒楄〃")
+ @Schema(description = "闄勪欢鍒楄〃")
private List<CommonFile> commonFiles;
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("褰曞叆浜篿d")
+ @Schema(description = "褰曞叆浜篿d")
private Long userId;
- @ApiModelProperty("褰曞叆浜哄悕绉�")
+ @Schema(description = "褰曞叆浜哄悕绉�")
@Excel(name = "褰曞叆浜哄悕绉�")
private String userName;
/**
* 璁￠噺鍣ㄥ叿缂栧彿
*/
- @ApiModelProperty("璁￠噺鍣ㄥ叿缂栧彿")
+ @Schema(description = "璁￠噺鍣ㄥ叿缂栧彿")
@Excel(name = "璁￠噺鍣ㄥ叿缂栧彿")
private String code;
/**
* 璁￠噺鍣ㄥ叿鍚嶇О
*/
- @ApiModelProperty("璁￠噺鍣ㄥ叿鍚嶇О")
+ @Schema(description = "璁￠噺鍣ㄥ叿鍚嶇О")
@Excel(name = "璁￠噺鍣ㄥ叿鍚嶇О")
private String name;
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
/**
* 鏈�杩戜竴娆℃瀹氭棩鏈�
*/
- @ApiModelProperty("鏈�杩戜竴娆℃瀹氭棩鏈�")
+ @Schema(description = "鏈�杩戜竴娆℃瀹氭棩鏈�")
@Excel(name = "鏈�杩戜竴娆℃瀹氭棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -77,14 +76,14 @@
/**
* 妫�瀹氭湁鏁堟湡
*/
- @ApiModelProperty("妫�瀹氭湁鏁堟湡")
+ @Schema(description = "妫�瀹氭湁鏁堟湡")
@Excel(name = "妫�瀹氭湁鏁堟湡")
private Integer valid;
/**
* 棰勮涓嬫妫�瀹氭棩鏈�
*/
- @ApiModelProperty("棰勮涓嬫妫�瀹氭棩鏈�")
+ @Schema(description = "棰勮涓嬫妫�瀹氭棩鏈�")
@Excel(name = "棰勮涓嬫妫�瀹氭棩鏈�" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -93,7 +92,7 @@
/**
* 褰曞叆鏃ユ湡
*/
- @ApiModelProperty("褰曞叆鏃ユ湡")
+ @Schema(description = "褰曞叆鏃ユ湡")
@Excel(name = "褰曞叆鏃ユ湡" , width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -103,8 +102,8 @@
/**
* 鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�
*/
- @ApiModelProperty("鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
- @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡,3=鍗冲皢鍒版湡")
+ @Schema(description = "鐘舵�侊紙1-鏈夋晥 2-閫炬湡锛�")
+ @Excel(name = "鐘舵��", readConverterExp = "1=鏈夋晥,2=閫炬湡")
private Integer status;
/**
@@ -137,16 +136,17 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty("閮ㄩ棬id")
- private Long deptId;
- @ApiModelProperty("瀹夎浣嶇疆")
- private String installationLocation;
-
- @ApiModelProperty("妫�瀹氬崟浣�")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("妫�瀹氬懆鏈�(澶�)")
- private Long cycle;
+ @Schema(description = "閮ㄩ棬id")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "瀹夎浣嶇疆")
+ private String instationLocation;
+
+ private String cycle;
}
--
Gitblit v1.9.3