Merge branch 'dev-zza' into dev

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java

@@ -55,6 +55,11 @@ public class GenerateOrderDTO extends BasicPileDTO{
 	 */
 	private BigDecimal chargeAmount;
 
+	/**
+	 * 保险金额
+	 */
+	private BigDecimal insuranceAmount;
+
 	/**
 	 * 充电桩枪口信息
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderDTO.java

@@ -37,6 +37,11 @@ public class PayOrderDTO extends BaseDTO{
 	 */
 	private BigDecimal payAmount;
 
+	/**
+	 * 保险金额
+	 */
+	private BigDecimal insuranceAmount;
+
 	/**
 	 * @see ScenarioEnum
 	 * 支付场景

jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderSuccessCallbackDTO.java

@@ -23,6 +23,11 @@ public class PayOrderSuccessCallbackDTO {
 	 */
 	private BigDecimal payAmount;
 
+	/**
+	 * 保险金额
+	 */
+	private BigDecimal insuranceAmount;
+
 	/**
 	 * 支付方式
 	 * 1-余额支付；2-微信支付；3-支付宝支付