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

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml

@@ -624,6 +624,7 @@
         SELECT
         csb.id,
         MAX(csb.name) AS name,
+        csb.social_credit_code AS socialCreditCode,
         MAX(cas.dept_id) AS deptId,
         MAX(caw.id) AS accessWorkId,
         MAX(caw.update_time) AS admissionTime,
@@ -715,6 +716,7 @@
         SELECT
         csb.id AS supplierId,
         csb.name AS supplierName,
+        csb.social_credit_code as socialCreditCode,
         '准入部门' AS deptName,
         category_info.categoryName AS categoryName,
         work_time.createTime AS createTime,