Merge branch 'master' of http://123.207.147.179:8888/node_server/yuyiDataServer

src/biz/findData.ts

@@ -50,7 +50,7 @@ function analysisParamToWhere(param, column) {
                     case "%notBetween%":
                         where[key][Op.notBetween] = param[key]["%notBetween%"];
                     break;
-                    case "%in%":
+                    case "%in%"://在范围内数据
                         where[key][Op.in] = param[key]["%in%"];
                     break;
                     case "%notIn%"://不在范围内数据

src/config/mysqlTableConfig.ts

@@ -197,7 +197,7 @@ export const TablesConfig = [
             // other: {type:Sequelize.STRING(255)},//新增其他
             
             kxTime: {type:Sequelize.DATE}, //科小认定时间
-            kxNumber: {type:Sequelize.INTEGER}, //新增科小上传编号
+            kxNumber: {type:Sequelize.STRING(255)}, //新增科小上传编号
             kxImg: {type:Sequelize.STRING(255)}, //科小证书
             zjtxTime: {type:Sequelize.DATE}, //专精特新认定时间
             zjtxImg: {type:Sequelize.STRING(255)}, //专精特新证书