优化 删除行程

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -171,16 +171,16 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("用户充值截图证据,  传入数组")
     @ApiModelProperty("用户充值截图证据,  传入数组")
     private String userRechargeCredentialsUrl;
     private String userRechargeCredentialsUrl;
 
 
-    @NotBlank(message = "商家开户银行不能为空")
-    @ApiModelProperty("商家开户银行")
-    private String rechargeBank;
-
-    @NotBlank(message = "商家开户名称不能为空")
-    @ApiModelProperty("商家开户名称")
-    private String rechargeName;
-
-    @NotBlank(message = "商家银行卡号")
-    @ApiModelProperty("商家银行卡号")
-    private String rechargeBankNumber;
+//    @NotBlank(message = "商家开户银行不能为空")
+//    @ApiModelProperty("商家开户银行")
+//    private String rechargeBank;
+//
+//    @NotBlank(message = "商家开户名称不能为空")
+//    @ApiModelProperty("商家开户名称")
+//    private String rechargeName;
+//
+//    @NotBlank(message = "商家银行卡号")
+//    @ApiModelProperty("商家银行卡号")
+//    private String rechargeBankNumber;
 
 
 }
 }

common/src/main/resources/mapper/StrokeMapper.xml

@@ -20,7 +20,7 @@
         user_id,
         user_id,
         mu.username AS merchantName,
         mu.username AS merchantName,
         outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,
         outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,
-        payment_status,audit_status,recharge_bank,recharge_name,recharge_bank_number
+        payment_status,audit_status,user_recharge_bank,user_recharge_name,user_recharge_bank_number
 
 
    </sql>
    </sql>
 
 
@@ -28,7 +28,7 @@
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
         id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
         ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status, user_recharge_money,user_recharge_bank,user_recharge_name,
         ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status, user_recharge_money,user_recharge_bank,user_recharge_name,
-    user_recharge_bank_number,user_recharge_credentials_url,recharge_bank,recharge_name,recharge_bank_number
+    user_recharge_bank_number,user_recharge_credentials_url
     </sql>
     </sql>
 
 
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">