pipIrr-SV.git - Gitblit

			@@ -22,7 +22,7 @@
			*/

			@Data
			@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cardState", "districtTitle", "villageId"})
			@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
			@HeadRowHeight(30)
			@ContentRowHeight(20)
			public class VoTradeDetails implements BaseEntity {
			@@ -113,9 +113,8 @@
			/**
			* 余额
			*/
			@JSONField(serializeUsing= ObjectWriterImplToString.class)
			@ColumnWidth(15)
			private Long money;
			private Double money;

			/**
			* 付款方式
			@@ -140,6 +139,12 @@
			private Long cashierId;

			/**
			* 收银员姓名
			*/
			@ColumnWidth(15)
			private String cashierName;

			/**
			* 卡片状态
			*/
			@ColumnWidth(15)