重置密码，系统级

admin-console/src/main/java/com/ibeetl/admin/console/web/UserConsoleController.java

@@ -243,6 +243,19 @@ public class UserConsoleController {
 		return JsonResult.success();
 	}
 
+	/**
+	 * 管理员重置用户密码
+	 *
+	 * @return
+	 */
+	@PostMapping(MODEL + "/initPassword.json")
+	@Function("user.reset")
+	@ResponseBody
+	public JsonResult initPassword(Long id) {
+		userConsoleService.resetPassword(id, "123qwe");
+		return JsonResult.success();
+	}
+
 	/**
 	 * 用户所有授权角色列表
 	 *

doc/sql/mysql/tianze-pro-update.sql

@@ -174,3 +174,71 @@ create table hands_on_simulation_tasks_file
     COLLATE = utf8_general_ci;
 
 alter table hands_on_simulation_tasks_file comment '课程实操-实训任务附件表';
+
+
+drop table if exists teacher_open_course_merge_resources_question;
+
+/*==============================================================*/
+/* Table: teacher_open_course_merge_resources_question          */
+/*==============================================================*/
+create table teacher_open_course_merge_resources_question
+(
+    teacher_open_course_merge_resources_question_id bigint unsigned not null comment 'ID',
+    teacher_open_course_id bigint comment '开课ID',
+    course_info_id       bigint comment '课程ID',
+    question_type        int(2) comment '题型(1单选 2多选 3判断)',
+    question_score       decimal(3,1) comment '分值',
+    question_stem        varchar(3000) comment '题干',
+    question_option_a    varchar(1000) comment '选项A',
+    question_option_b    varchar(1000) comment '选项B',
+    question_option_c    varchar(1000) comment '选项C',
+    question_option_d    varchar(1000) comment '选项D',
+    question_option_e    varchar(1000) comment '选项E',
+    question_answer      varchar(255) comment '答案（单选是一个 多选是多个 判断是对错）',
+    question_analysis    varchar(3000) comment '解析',
+    question_status      int(2) comment '题目状态 （1上架， 0下架）',
+    user_id              bigint comment '后台用户ID',
+    org_id               bigint comment '组织机构ID',
+    primary key (teacher_open_course_merge_resources_question_id)
+)
+    auto_increment = 1
+    ENGINE = InnoDB
+    DEFAULT CHARACTER SET = utf8
+    COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_merge_resources_question comment '开课-题库管理-离线';
+
+
+drop table if exists teacher_open_course_merge_course_info;
+
+/*==============================================================*/
+/* Table: teacher_open_course_merge_course_info                 */
+/*==============================================================*/
+create table teacher_open_course_merge_course_info
+(
+    teacher_open_course_merge_course_info_id bigint unsigned not null auto_increment comment 'ID',
+    teacher_open_course_id bigint comment '开课ID',
+    course_info_name     varchar(255) comment '名称（课程名 或 章名 或 节名）',
+    course_info_thumbnail varchar(255) comment '课程缩略图',
+    course_label_id      bigint comment '课程标签ID',
+    course_info_basics_count integer comment '课程学习人数基数',
+    course_info_content  varchar(3000) comment '课程简介',
+    course_info_status   int(2) comment '状态(1启用 2禁用 3删除)',
+    course_info_type     int(2) comment '类型(1课程 2章 3节)',
+    course_info_parent_id bigint comment '父节点ID',
+    course_video_id      bigint comment '视频ID(resources_info_id，和节对应)',
+    course_courseware_id bigint comment '课件ID(resources_info_id，和节对应)',
+    course_enclosure_ids varchar(3000) comment '附件IDs(resources_info_id，和节对应)',
+    resources_question_ids varchar(3000) comment '客观题IDs（和章对应）',
+    resources_competition_ids varchar(3000) comment '竞赛题IDs（和章对应）',
+    resources_training_ids varchar(3000) comment '实训题IDs（和章对应）',
+    org_id               bigint comment '组织机构ID',
+    user_id              bigint comment '后台用户ID',
+    primary key (teacher_open_course_merge_course_info_id)
+)
+    auto_increment = 1
+    ENGINE = InnoDB
+    DEFAULT CHARACTER SET = utf8
+    COLLATE = utf8_general_ci;
+
+alter table teacher_open_course_merge_course_info comment '开课- 课程配置-离线';

web/src/main/java/com/ibeetl/jlw/web/ResourcesQuestionSnapshotController.java

@@ -82,7 +82,7 @@ public class ResourcesQuestionSnapshotController{
     }
 
     @PostMapping(API + "/list.do")
-    public JsonResult<PageQuery> list(ResourcesQuestionSnapshotQuery condition){
+    public JsonResult<PageQuery> listDo(ResourcesQuestionSnapshotQuery condition){
         PageQuery page = condition.getPageQuery();
         resourcesQuestionSnapshotService.queryByCondition(page);
         return JsonResult.success(page);
@@ -123,6 +123,14 @@ public class ResourcesQuestionSnapshotController{
 
     /* 后台接口 */
 
+    @PostMapping(MODEL + "/list.json")
+    @Function("resourcesQuestionSnapshot.query")
+    public JsonResult<PageQuery> list(ResourcesQuestionSnapshotQuery condition){
+        PageQuery page = condition.getPageQuery();
+        resourcesQuestionSnapshotService.queryByCondition(page);
+        return JsonResult.success(page);
+    }
+
     @PostMapping(MODEL + "/addAll.json")
     @Function("resourcesQuestionSnapshot.add")
     public JsonResult addAll(ResourcesQuestionSnapshotQuery resourcesQuestionSnapshotQuery,@SCoreUser CoreUser coreUser){