Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessEnterpriseRelationalMapper.xml

@@ -40,17 +40,17 @@
         AND a.receipt_type = '1'
         ) a,
         (
-        SELECT
-        IFNULL( SUM( Round( IF ( b.unit = '千克', b.net_weight / 1000, net_weight ), 3 )), 0 ) AS salesVolumeToday
-        FROM
-        jg_receipt_order a
-        LEFT JOIN jg_delivery_voucher_relation b ON a.id = b.order_id
-        AND b.f_delete_mark IS NULL
-        WHERE
-        to_days( a.f_creator_time ) = to_days(
-        now())
-        AND a.f_delete_mark IS NULL
-        AND a.receipt_type = '2'
+            SELECT
+                IFNULL( SUM( Round( IF ( b.unit = '千克', b.net_weight / 1000, net_weight ), 3 )), 0 ) AS salesVolumeToday
+            FROM
+                jg_delivery_order a
+                    LEFT JOIN jg_delivery_voucher_relation b ON a.id = b.order_id
+                    AND b.f_delete_mark IS NULL
+            WHERE
+                    to_days( a.f_creator_time ) = to_days(
+                        now())
+              AND a.f_delete_mark IS NULL
+              AND a.delivery_type = '2'
         ) b,
         (
         SELECT