Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test

performance-api/src/main/java/com/clx/performance/vo/pc/OwnerAccountVO.java

@@ -56,6 +56,11 @@ public class OwnerAccountVO {
     @ApiModelProperty(value = "冻结金额")
     @MoneyOutConvert
     private BigDecimal frozenBalance;
+
+    @ApiModelProperty(value = "扣除金额")
+    @MoneyOutConvert
+    private BigDecimal takeOutBalance;
+
     /**
      * 创建人
      */

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerAccountSqlProvider.java

@@ -20,7 +20,7 @@ public class OwnerAccountSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.owner_user_name, a.mobile, a.account_type, " +
-                    " a.account_balance,a.usable_balance, a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
+                    " a.account_balance,a.usable_balance,a.take_balance, a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_account a");