Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-03-04 5e1a7961fdde6cf8b4ac12a3ad11dad6ca7474e2

 src/utils/generator/html.js

@@ -57,7 +57,7 @@
  if (conf.formBtns && type === 'file') {
    str = `<el-form-item size="large">
          <el-button type="primary" @click="submitForm">提交</el-button>
          <el-button @click="resetForm">重置</el-button>
          <el-button @click="resetForm">重 置</el-button>
        </el-form-item>`
    if (someSpanIsNot24) {
      str = `<el-col :span="24">