fix: merge 解决冲突

2025-06-04 13:22:33 +08:00
parent db10830bbb 4f219881c2
commit 01cb73050b
62 changed files with 1737 additions and 433 deletions
--- a/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/simple-model-design.vue
@@ -42,4 +42,3 @@ defineExpose({ validateConfig });
    />
  </ContentWrap>
 </template>
-<style lang="scss" scoped></style>
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/operation-button.vue
@@ -1389,4 +1389,3 @@ defineExpose({ loadTodoTask });
  <!-- 签名弹窗 -->
  <Signature ref="signRef" @success="handleSignFinish" />
 </template>
-<style lang="scss" scoped></style>