Merge remote-tracking branch 'origin/master'

vince

2023-07-20 e4609e7ea92f3939802fafc15fd784213ed00b5f

 igds-web/src/main/resources/templates/test/TAiry.html

@@ -70,8 +70,8 @@
        <td colspan="2">设计存粮线高度</td>
    </tr>
    <tr>
        <td>CH</td>
        <td>CX</td>
        <td>siloNumber</td>
        <td>deptType</td>
        <td colspan="2">PNLength</td>
        <td colspan="2">PNWidth</td>
        <td colspan="2">PNHeight</td>
@@ -131,12 +131,12 @@
        <td colspan="2">送风方式</td>
    </tr>
    <tr>
        <td colspan="2">TFJXH</td>
        <td colspan="2">TFJNumber</td>
        <td colspan="2">DTFJEDQY</td>
        <td colspan="2">DTFJEDFL</td>
        <td colspan="2">DTFJEDGL</td>
        <td colspan="2">SFFS</td>
        <td colspan="2">WTFJXH</td>
        <td colspan="2">WTFJNumber</td>
        <td colspan="2">WDTFJEDQY</td>
        <td colspan="2">WDTFJEDFL</td>
        <td colspan="2">WDTFJEDGL</td>
        <td colspan="2">windType</td>
    </tr>
    <tr>
        <td rowspan="2">运行工艺参数</td>
@@ -148,12 +148,12 @@
        <td colspan="2">总耗电量(kw)</td>
    </tr>
    <tr>
        <td colspan="2">TFJXH</td>
        <td colspan="2">TFJNumber</td>
        <td colspan="2">DTFJEDQY</td>
        <td colspan="2">DTFJEDFL</td>
        <td colspan="2">DTFJEDGL</td>
        <td colspan="2">SFFS</td>
        <td colspan="2">WYXGYCS</td>
        <td colspan="2">WDTFJSCFL</td>
        <td colspan="2">WDTFJZGL</td>
        <td colspan="2">WZFL</td>
        <td colspan="2">WSCXTZL</td>
        <td colspan="2">WZHDL</td>
    </tr>
    <tr>
        <td rowspan="3">作业过程</td>
@@ -231,6 +231,7 @@
        <td colspan="2">单台风机额定功率(Kw)</td>
        <td colspan="2">送风方式</td>
    </tr>

    <tr>
        <td colspan="2">STFJXH</td>
        <td colspan="2">STFJNumber</td>
@@ -249,12 +250,12 @@
        <td colspan="2">总耗电量(kw)</td>
    </tr>
    <tr>
        <td colspan="2">STFJXH</td>
        <td colspan="2">STFJNumber</td>
        <td colspan="2">SDTFJEDQY</td>
        <td colspan="2">SDTFJEDFL</td>
        <td colspan="2">SDTFJEDGL</td>
        <td colspan="2">SSFFS</td>
        <td colspan="2">SYXGYCS</td>
        <td colspan="2">SDTFJSCFL</td>
        <td colspan="2">SDTFJZGL</td>
        <td colspan="2">SZFL</td>
        <td colspan="2">SSCXTZL</td>
        <td colspan="2">SZHDL</td>
    </tr>
    <tr>
        <td rowspan="3">作业过程</td>