From b22f741e6918c675fabe5aabc688d2f52858319a Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期一, 09 十月 2023 09:46:43 +0800 Subject: [PATCH] #pgsql 退款 结算 --- server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java index 427a040..dd62879 100644 --- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java +++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java @@ -41,7 +41,7 @@ @ExcelColumn(name="缂栬緫浜�") private String editor; - @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1") + @ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�") @TableLogic private Integer isdeleted; @@ -64,7 +64,7 @@ @ExcelColumn(name="杞﹁締缂栫爜") private String bikeCode; - @ApiModelProperty(value = "褰撳墠璐︽埛浣欓", example = "1") + @ApiModelProperty(value = "褰撳墠璐︽埛浣欓") @ExcelColumn(name="褰撳墠璐︽埛浣欓") private BigDecimal balance; @@ -111,31 +111,31 @@ @ExcelColumn(name="杩樿溅鎸囦护缂栫爜") private String backCommondId; - @ApiModelProperty(value = "璧锋浠�", example = "1") + @ApiModelProperty(value = "璧锋浠�") @ExcelColumn(name="璧锋浠�") private BigDecimal basePrice; - @ApiModelProperty(value = "璧锋浠锋椂闂�", example = "1") + @ApiModelProperty(value = "璧锋浠锋椂闂�") @ExcelColumn(name="璧锋浠锋椂闂�") private Integer baseTime; - @ApiModelProperty(value = "瓒呭嚭鍗曚环", example = "1") + @ApiModelProperty(value = "瓒呭嚭鍗曚环") @ExcelColumn(name="瓒呭嚭鍗曚环") - private Integer unitPrice; + private BigDecimal unitPrice; - @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅", example = "1") + @ApiModelProperty(value = "瓒呭嚭鏃堕棿鍗曚綅") @ExcelColumn(name="瓒呭嚭鏃堕棿鍗曚綅") private Integer unitTime; - @ApiModelProperty(value = "楠戣浠锋牸", example = "1") + @ApiModelProperty(value = "楠戣浠锋牸") @ExcelColumn(name="楠戣浠锋牸") private BigDecimal price; - @ApiModelProperty(value = "楠戣瀹為檯浠锋牸", example = "1") + @ApiModelProperty(value = "楠戣瀹為檯浠锋牸") @ExcelColumn(name="楠戣瀹為檯浠锋牸") private BigDecimal actualPrice; - @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱", example = "1") + @ApiModelProperty(value = "楠戣璁¤垂鏃堕暱") @ExcelColumn(name="楠戣璁¤垂鏃堕暱") private Integer duration; @@ -144,7 +144,7 @@ //@JsonFormat(pattern = "yyyy-MM-dd") private Date closeDate; - @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�", example = "1") + @ApiModelProperty(value = "缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�") @ExcelColumn(name="缁撶畻鐘舵�� 0鏈粨绠� 1宸茬粨鏉�") private Integer closeStatus; @@ -152,7 +152,7 @@ @ExcelColumn(name="鍏宠仈璁㈠崟缂栫爜(鍏宠仈goodsorder锛�") private String ordreId; - @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�", example = "1") + @ApiModelProperty(value = "鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�") @ExcelColumn(name="鏄惁缁撶畻璁¤垂杞﹀瀷 0鍚� 1鏄�") private Integer isStandard; @@ -164,11 +164,11 @@ @ExcelColumn(name="鏄惁鑺傚亣鏃� 0涓嶆槸 1鏄�") private String isHoliday; - @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�", example = "1") + @ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�") @ExcelColumn(name="鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�") private Integer status; - @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅", example = "1") + @ApiModelProperty(value = "杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅") @ExcelColumn(name="杩樿溅绫诲瀷 0姝e父杩樿溅 1寮哄埗杩樿溅") private Integer backType; -- Gitblit v1.9.3