Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -51,7 +51,7 @@
             IFNULL(sca.PID,'0') AS pid,
             IFNULL(sca.PIDS,'0') AS pids,
             #{customerId} as customerId,
-            od.CATEGORY_ORIGIN_CUSTOMER_ID AS categoryOriginCustomerId,
+            od.CUSTOMER_ID AS categoryOriginCustomerId,
             od.level,
             <if test="existsStatus == true">
                 cd.EPMET_CATEGORY_CODE AS categoryCode,