d29dc992 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents ec606124 c0c60b6e
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
38 flex-wrap: wrap; 38 flex-wrap: wrap;
39 flex: 1; 39 flex: 1;
40 max-height: 38px; 40 max-height: 38px;
41 padding-left: 0 !important;
41 42
42 li { 43 li {
43 color: $light-blue; 44 color: $light-blue;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-30 10:45:10 4 * @LastEditTime: 2023-10-30 11:07:58
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
8 9999999999
9 <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam" 8 <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
10 :columns="columns" :tableData="tableData" /> 9 :columns="columns" :tableData="tableData" />
11 </div> 10 </div>
......