Merge branch 'feature/v2-renewal' of http://39.117.244.52:3000/kjs/ERP-node into feature/v2-unified-renewal

backend-node/src/services/categoryTreeService.ts

@@ -563,10 +563,10 @@ class CategoryTreeService {
           cv.table_name AS "tableName", 
           cv.column_name AS "columnName",
           COALESCE(tl.table_label, cv.table_name) AS "tableLabel",
-          COALESCE(cl.column_label, cv.column_name) AS "columnLabel"
+          COALESCE(ttc.column_label, cv.column_name) AS "columnLabel"
         FROM category_values_test cv
         LEFT JOIN table_labels tl ON tl.table_name = cv.table_name
-        LEFT JOIN column_labels cl ON cl.table_name = cv.table_name AND cl.column_name = cv.column_name
+        LEFT JOIN table_type_columns ttc ON ttc.table_name = cv.table_name AND ttc.column_name = cv.column_name AND ttc.company_code = '*'
         WHERE cv.company_code = $1 OR cv.company_code = '*'
         ORDER BY cv.table_name, cv.column_name
       `;