Merge branch 'sprint/S1' into develop

doc/sql/app-20230630-ddl.sql

@@ -19,8 +19,6 @@ CREATE TABLE `cps_question_info`
     `completion_time`           VARCHAR(520) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
     `control_area`              DATETIME NULL DEFAULT NULL,
     `knowledge_accumulation`    VARCHAR(520) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
-    `measures_from`             VARCHAR(520) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
-    `accumulation_from`         VARCHAR(520) NULL DEFAULT '' COLLATE 'utf8mb4_general_ci',
     `status`                    INT(2) NULL DEFAULT '0' COMMENT '状态',
     `status1`                   INT(2) NULL DEFAULT '0' COMMENT '状态1',
     `status2`                   INT(2) NULL DEFAULT '0' COMMENT '状态2',

doc/sql/app-20230703-ddl.sql

@@ -0,0 +1 @@
+alter table cps_question_info Add column measures_from varchar(520) null default '' AFTER `knowledge_accumulation`, Add column accumulation_from varchar(520) null default '' AFTER `knowledge_accumulation`;