Merge branch 'master' into 3.5

# Conflicts:
#	src/main/resources/mapper/order/OrderCommentMapper.xml

src/main/resources/mapper/order/OrderCommentMapper.xml

@@ -34,6 +34,7 @@
             <result column="cus_real_name" property="realName"/>
             <result column="cus_store_record_real_name" property="storeRecordRealName"/>
             <result column="cus_customer_source" property="customerSource"/>
+            <result column="cus_headimgurl" property="headimgurl"/>
         </association>
         <association property="orderServe" javaType="com.gogirl.domain.order.serve.OrderServe">
             <result column="orser_id" property="id"/>
@@ -57,7 +58,6 @@
         <result column="label_id" property="id"></result>
         <result column="label_name" property="name"></result>
     </resultMap>
-
     <sql id="orderCommentSql">
         oc.id,
         oc.order_id,
@@ -72,7 +72,6 @@
         oc.status,
         oc.technician_id
     </sql>
-
     <sql id="orderServeSql">
         orser.id orser_id,
         orser.order_id orser_order_id,
@@ -85,18 +84,18 @@
         orser.execution_status orser_execution_status,
         orser.comment_score orser_comment_score
     </sql>
-
     <sql id="serveSql">
         ser.id ser_id,
         ser.name ser_name,ser.type ser_type,
-        ser.label ser_label, ser.shop_sort ser_shop_sort,
-        ser.price ser_price, ser.picture_path ser_picture_path,
+        ser.label ser_label,
+        ser.shop_sort ser_shop_sort,
+        ser.price ser_price,
+        ser.picture_path ser_picture_path,
         ser.status ser_status,
         ser.remark ser_remark,
         ser.details ser_details,
         ser.service_duration ser_service_duration
     </sql>
-
     <sql id="technicianSql">
         tech.id tech_id,
         tech.technician_no tech_technician_no,