Merge branch 'dev' into 'mp-server-test'

redis 恢复到168

See merge request quanshu/mp-server!117

mp-admin/src/main/resources/application-test.yml

@@ -14,9 +14,9 @@ logging:
 # 数据源配置
 spring:
     redis:
-      host: 110.40.236.236
+      host: 113.31.162.168
       port: 6379
-      password: '@9(s2sWppxkess'
+      password: CjPfyr77Bbdfg
       # 连接超时时间（毫秒）
       timeout: 10000
       jedis:

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrder.java

@@ -76,6 +76,12 @@ public class UserDeliverOrder implements Serializable {
   @TableField("order_num")
   private Integer orderNum;
 
+  /**
+   * 支付金额
+   */
+  @TableField("pay_amt")
+  private Integer payAmt;
+
   /**
    * 运费
    */

mp-service/src/main/resources/mapper/user/UserDeliverOrderMapper.xml

@@ -13,6 +13,7 @@
         <result column="area" property="area" />
         <result column="address" property="address" />
         <result column="order_num" property="orderNum" />
+        <result column="pay_amt" property="payAmt" />
         <result column="freight_amt" property="freightAmt" />
         <result column="memo" property="memo" />
         <result column="delivery_id" property="deliveryId" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        order_id, user_id, receiver, tel, province, city, area, address, order_num, freight_amt, memo, delivery_id, delivery_flow_id, status, created_time, updated_time
+        order_id, user_id, receiver, tel, province, city, area, address, order_num, pay_amt, freight_amt, memo, delivery_id, delivery_flow_id, status, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>