Merge remote-tracking branch 'origin/developer' into developer

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

@@ -1144,7 +1144,7 @@
 	</select>
 
     <select id="findShopReceipt" resultType="java.lang.Double">
-        SELECT SUM(associateAmount) FROM (
+        SELECT ifnull(SUM(associateAmount), 0) as associateAmount FROM (
              SELECT
                  SUM(associateAmount) AS associateAmount
              FROM cm_receipt_order_relation cror