Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang

chenhuan

2024-05-21 259f95deb2ea38287d488d12060d7600c36cd92a

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/projectData/projectData2.html

@@ -15,6 +15,10 @@
                                <input type="text" name="name"/>
                            </li>
                            <li>
                                <p>钻孔编号：</p>
                                <input type="text" name="holeCode"/>
                            </li>
                            <li>
                                <p>业务类型：</p>
                                <select name="fileType" th:with="type=${@dict.getType('project_data_file_type')}">
                                    <option value="">所有</option>
@@ -82,6 +86,10 @@
                    field : 'name',
                    title : '资料名称'
                },
                    {
                        field : 'holeCode',
                        title : '钻孔编号'
                    },
                {
                    field : 'fileType',
                    title : '业务类型',