Merge branch 'master' of http://47.97.51.208/root/zrch-risk-39

83ce0315 · liuluyu · a7834955 · 436c3f26 · 83ce0315 · 83ce0315
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb10.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb10.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb11.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb11.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb2.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb2.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb3.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb3.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb4.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb4.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb5.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb5.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb6.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb6.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb7.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb7.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb8.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb8.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/Tb9.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/Tb9.vue
--- a/zrch-risk-client-39/src/views/baosong/report/components/check/ValidationDrawer.vue
+++ b/zrch-risk-client-39/src/views/baosong/report/components/check/ValidationDrawer.vue
--- a/zrch-risk-client-39/src/views/flowable/definition/InnerForm.vue
+++ b/zrch-risk-client-39/src/views/flowable/definition/InnerForm.vue
--- a/zrch-risk-client-39/src/views/flowable/task/components/FlowInnerForm.vue
+++ b/zrch-risk-client-39/src/views/flowable/task/components/FlowInnerForm.vue
--- a/zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue
+++ b/zrch-risk-client-39/src/views/flowable/task/todo/components/TodoIndex.vue
--- a/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowNextDto.java
+++ b/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowNextDto.java
--- a/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/FlowTaskVo.java
+++ b/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/vo/FlowTaskVo.java
--- a/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/flow/FindNextNodeUtil.java
+++ b/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/flow/FindNextNodeUtil.java
--- a/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowInstanceServiceImpl.java
+++ b/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowInstanceServiceImpl.java
--- a/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/zrch-risk-server-39/jeecg-module-system/jeecg-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java