Merge branch 'master' of lvjian/kmall-pt into master

.gitignore

@@ -24,4 +24,10 @@
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+
+
+### Maven ###
+target/
+**/target
+**/target/

kmall-api/src/main/resources/mybatis/mapper/ApiOrderMapper.xml

@@ -756,7 +756,7 @@
 
     <select id="queryOrderByMerchOrderSnAndRefundStatus" resultMap="orderMap">
         select * from mall_order o inner join mall_order_refund r on r.order_id = o.id where o.merch_order_sn = #{merchOrderSn}
-         and r.refund_status = 2
+         and r.refund_status = 5
     </select>
 
     <select id="querySubmitNumByStoreTopicId" resultType="com.kmall.api.entity.OrderVo">