合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

 src/components/do/b3-work-time-management/work-time-config.vue

@@ -200,7 +200,7 @@
      margin-top: 10px;
      background-color: #fff;
      width: calc(100% - 40px);
      height: calc(100% - 60px - 80px - 10px - 40px);
      height: calc(100% - 60px - 80px - 10px - 24px);
      padding: 20px;
   }
</style>