Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/smartSchool/electronicArchives/professionalDevelopment/teachingAchievements/index.vue

@@ -342,6 +342,18 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="优生增量" prop="yszl">
+                            <el-input v-model="form.yszl" placeholder="请输入优生增量" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="常规增量" prop="cgzl">
+                            <el-input v-model="form.cgzl" placeholder="请输入常规增量" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
                 <el-form-item label="备注" prop="remark">
                     <el-input v-model="form.remark" placeholder="请输入备注" clearable />
                 </el-form-item>