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

2026-01-05 18:23:14 +09:00
parent 6295b52e87 6925e3af3f
commit 5e688ca28c
10 changed files with 2012 additions and 158 deletions
--- a/frontend/components/screen/panels/DataFlowPanel.tsx
+++ b/frontend/components/screen/panels/DataFlowPanel.tsx
@@ -455,3 +455,4 @@ export default function DataFlowPanel({ groupId, screenId, screens = [] }: DataF
 }


+
--- a/frontend/components/screen/panels/FieldJoinPanel.tsx
+++ b/frontend/components/screen/panels/FieldJoinPanel.tsx
@@ -407,3 +407,4 @@ export default function FieldJoinPanel({ screenId, componentId, layoutId }: Fiel
 }


+
				`@@ -455,3 +455,4 @@ export default function DataFlowPanel({ groupId, screenId, screens = [] }: DataF`
				`}`
				`@@ -407,3 +407,4 @@ export default function FieldJoinPanel({ screenId, componentId, layoutId }: Fiel`
				`}`