Merge remote-tracking branch 'origin/master'

jwtech-generator/src/main/resources/vm/vue/index.vue.vm

@@ -19,11 +19,19 @@
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-button
+              type="primary"
+              slot="append"
+              icon="el-icon-search"
+              size="small"
+              @click="handleQuery"
+          ></el-button>
+        </el-input>
       </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
       <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.data.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+        <el-select v-model="queryParams.data.${column.javaField}" placeholder="请选择${comment}" clearable size="small" @change="handleQuery">
           <el-option
             v-for="dict in ${column.javaField}Options"
             :key="dict.dictValue"

jwtech-system/src/main/java/com/kms/earlyStage/domain/ProjectBidWining.java

@@ -145,4 +145,6 @@ public class ProjectBidWining extends BaseEntity
     @ApiModelProperty("数源部门")
     private String owerDept;
 
+    private String bidQuotation;
+
 }