Merge branch 'dev/lanpingxiong' into 'master'

# 用户下单功能

See merge request hewei/Jumeirah!20

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

@@ -10,7 +10,7 @@
         city_outset_name,
         city_outset_name,
         city_arrive_id,
         city_arrive_id,
         city_arrive_name,
         city_arrive_name,
-        people_mun,
+        people_num,
         plain_type_id,
         plain_type_id,
         outset_time,
         outset_time,
         return_time,
         return_time,
@@ -26,7 +26,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_num, 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
     user_recharge_bank_number,user_recharge_credentials_url
     </sql>
     </sql>