From 2edfe17a39cb5aa653318cad9474d18fbdaa204e Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期四, 30 五月 2024 18:23:47 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java index d4405dc..f725a46 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/ApproveParam.java @@ -46,8 +46,8 @@ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") private Integer isdeleted; - @ApiModelProperty(value = "澶囨敞") - @ExcelColumn(name="澶囨敞") + @ApiModelProperty(value = "鑺傜偣鍚嶇О") + @ExcelColumn(name="鑺傜偣鍚嶇О") private String remark; @ApiModelProperty(value = "绫诲瀷 0瀹℃壒 1鎶勯��", example = "1") @@ -83,8 +83,8 @@ @ExcelColumn(name="瀹℃壒涓荤绛夌骇 0鐩存帴涓荤 1浜岀骇涓荤 2涓夌骇涓荤 4鍥涚骇涓荤") private Integer objLevel; - @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱", example = "1") - @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱") + @ApiModelProperty(value = "澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒", example = "1") + @ExcelColumn(name="澶氫汉瀹℃壒鏂瑰紡 0鎴栫 1浼氱 2鍗曚汉瀹℃壒") private Integer approveType; @ApiModelProperty(value = "鏃犱富绠¢�夐」 0娴佺▼缁撴潫 1鐢变笂绾т富绠′唬鏇垮鏍�", example = "1") -- Gitblit v1.9.3