Merge remote-tracking branch 'origin/master'

16639036659

2023-08-21 c0d6e7b5da697bb7dff873839fd28f14a490d247

 src/main/resources/templates/tr/hiddenDangerCheck/dangerReport/addDangerReportWholeProcess.html

@@ -312,8 +312,9 @@
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label is-required">隐患整改资金：</label>
                <div class="col-sm-8">
                    <input name="rectifyFund" class="form-control" type="text" required>
                <div class="col-sm-8" style="display: flex;align-items: center">
                    <input name="rectifyFund" class="form-control" type="number" placeholder="请输入数字（单位：万）" required>
                    <span style="width: 50px;background: #ccc;height:34px;text-align: center;line-height: 34px">万</span>
                </div>
            </div>
            <div class="form-group">