Skip to content

I
integrity_risk_prevention
Commit f3dcd903 authored by drigle's avatar drigle
Browse files
Options

docs: remove leftover conflict marker

parent a0e5ab9c
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
src/pages/integrity_risk_prevention/integrity-risk-prevention.business-flow.md
View file @ f3dcd903
...@@ -83,8 +83,6 @@ ...@@ -83,8 +83,6 @@
`risk_prevention_control_measures_table_department_item` Subject 动态渲染字段；保存后立即 `risk_prevention_control_measures_table_department_item` Subject 动态渲染字段；保存后立即
合并全部子项到主对象并刷新过程表。找不到对应 `item_id` 时终止操作并提示刷新，禁止误用 合并全部子项到主对象并刷新过程表。找不到对应 `item_id` 时终止操作并提示刷新，禁止误用
展开行包装数据、其他部门子项或主对象合并结果。 展开行包装数据、其他部门子项或主对象合并结果。
>>>>>>> eaef1ed (feat: support department item editing and risk workflow)
### 2.1 Subject View 授权 ### 2.1 Subject View 授权
#### 2.1.1 通用列表与新增记录交互 #### 2.1.1 通用列表与新增记录交互
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment