Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

bug
2022-07-21 17:13:55 +08:00 · 2022-07-21 17:13:39 +08:00
2 changed files with 3 additions and 0 deletions
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@ -419,6 +419,7 @@ export default {
      flex-direction: column;
      align-items: center;
      padding: 10px;
      overflow: hidden;
      & > div:first-child {
        margin-bottom: 10px;
        font-weight: bold;
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@ -61,6 +61,8 @@
        > -->
      </div>
    </div>
    <!--  流程详情   -->
    <ren-process-detail></ren-process-detail>
    <el-dialog
      title="审批意见"
      :visible.sync="dialogVisible"
Author	SHA1	Message	Date
gaoyuanwei	12f0bdc814	Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev	2022-07-21 17:13:55 +08:00
gaoyuanwei	3a34e97ec8	bug	2022-07-21 17:13:39 +08:00