Merge remote-tracking branch 'origin/developerF' into developerJ

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1362,7 +1362,8 @@
           AND shopOrderId = 24665
     </select>
     <select id="findSettleRecord" resultType="com.caimei.modules.order.entity.SettleRecord">
-        select settleAmount,shopOrderId,settleTime from cm_settle_record csr
+        select distinct
+        csr.settleAmount,csr.shopOrderId,csr.settleTime from cm_settle_record csr
         left join cm_shop_order cso on csr.shopOrderId = cso.shopOrderID
         where cso.orderID=#{orderID}
         and settleType = 2