Merge remote-tracking branch 'origin/release/5.12.6' into release/5.12.6

# Conflicts:
#	cbkj_web_api/src/main/java/com/jiuzhekan/cbkj/common/utils/excel/ExportExcel.java

cbkj_web_api/src/main/resources/application.properties

@@ -1,13 +1,13 @@
 server.port=88
 
 #\u6570\u636E\u5E93\u914D\u7F6E
-#spring.datasource.primary.username = DgUfz0nYLCR7UJ66sgG1ag==
-#spring.datasource.primary.password = OPXCNabmBpi/FKayjb2kubBySH5LiQln
-#spring.datasource.primary.url=jdbc:mysql://47.111.67.16:3307/cbkj_web_api_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.primary.username = DgUfz0nYLCR7UJ66sgG1ag==
+spring.datasource.primary.password = OPXCNabmBpi/FKayjb2kubBySH5LiQln
+spring.datasource.primary.url=jdbc:mysql://47.111.67.16:3307/cbkj_web_api_dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 
-spring.datasource.primary.username = RVYQ+dq7Z9GrSl0fYA8/Pw==
-spring.datasource.primary.password = WwkFHCZbwqYBWP/3a378oQ==
-spring.datasource.primary.url=jdbc:mysql://192.168.2.172:3306/cbkj_web_api_xindu?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#spring.datasource.primary.username = RVYQ+dq7Z9GrSl0fYA8/Pw==
+#spring.datasource.primary.password = WwkFHCZbwqYBWP/3a378oQ==
+#spring.datasource.primary.url=jdbc:mysql://192.168.2.172:3306/cbkj_web_api_xindu?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
 
 ## redis\u914D\u7F6E
 spring.redis.host = 47.114.47.147

cbkj_web_api/src/main/resources/mappers/business/doctor/TDoctorCollectMapper.xml

@@ -105,6 +105,9 @@
             <if test="createUser != null and createUser !=''">
                 and CREATE_USER = #{createUser}
             </if>
+            <if test="connectId != null and connectId !=''">
+                and CONNECT_ID = #{connectId}
+            </if>
         </where>
         order by collect.CREATE_DATE desc
     </select>

cbkj_web_api/src/main/resources/sqlRecord/pre_api_v5.12.6.sql

@@ -0,0 +1,4 @@
+-- 2022-01-14 zjh CONNECT_ID字段长度改为65，因为临床诊疗指南需要
+ALTER TABLE t_doctor_collect`
+    CHANGE `CONNECT_ID` `CONNECT_ID` VARCHAR (65) CHARSET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '关联id:例如 药品id,方剂id';
+