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

src/biz/mysql/findData.ts

@@ -49,6 +49,12 @@ function analysisParamToWhere(param, column) {
                     case "%notBetween%":
                         where[key][Op.notBetween] = param[key]["%notBetween%"];
                     break;
+                    case "%in%":
+                        where[key][Op.in] = param[key]["%in%"];
+                    break;
+                    case "%notIn%":
+                        where[key][Op.notIn] = param[key]["%notIn%"];
+                    break;
                 }
             }
         }else {

src/config/mysqlTableConfig.ts

@@ -212,6 +212,8 @@ export const TablesConfig = [
             courseTypeName: {type:Sequelize.INTEGER, allowNull:false}, //课程类型id 枚举
             courseEntryType: {type:Sequelize.INTEGER, allowNull:false}, //课程录入类型 1：视频课程、2：文字课程
             hits: {type:Sequelize.INTEGER, allowNull:false}, //点击量
+            coverImage: {type:Sequelize.STRING(500), allowNull:true, defaultValue:'defalitImage.png'}, //封面图
+            videoDuration: {type:Sequelize.STRING(500), allowNull:true}, //视频时长
             isUse: {type:Sequelize.BOOLEAN, allowNull:false, defaultValue:true}, //是否使用
             fileName: {type:Sequelize.STRING(500), allowNull:true, defaultValue:'[]'}, //文件名称 ["",""] --多选
             fileType: {type:Sequelize.INTEGER, allowNull:true}, //文件类型