Merge remote-tracking branch 'origin/master'

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
                 f.zfi_id                                        'zfiId',
                 f.zfi_supplier_id                               'zfiSupplierId',
+                f.zfi_core_status                               'zfiCoreStatus',
                 f.zfi_core_id                                   'zfiCoreId',
                 f.zfi_product_id                                'zfiProductId',
                 f.zfi_create_type                               'zfiCreateType',
@@ -28,7 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 p.zfp_platform                                  'zfpPlatform',
                 f.zfi_payment_number                            'zfiPaymentNumber',
                 p.zfp_auth_type                                 'zfpAuthType'
-
             FROM  zc_finance_inf f
             LEFT JOIN  sys_company y
             ON y.scy_id = f.zfi_supplier_id