Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/probationShopOrderMapper.xml

@@ -381,6 +381,11 @@
  	</select>
 
 	<!--查詢訂單表-->
+	<resultMap type="com.iamberry.wechat.core.entity.order.Order" id="selectProbationShopOrderListResult">
+		<result property="salesOrderid" column="sales_orderid" />
+		<result property="salesPostFirm" column="sales_post_firm" />
+		<result property="salesPostNum" column="sales_post_num" />
+	</resultMap>
 	<select id="selectWateroPFOrderList" resultMap="selectProbationShopOrderListResult">
 		SELECT
 		o.sales_orderid,