Merge branch 'master' of http://120.78.165.83:8123/git/nazw into master

nngkxxdp/src/main/java/com/example/nngkxxdp/util/ArticleSmsUtil.java

@@ -27,8 +27,8 @@ import cn.hutool.http.HttpRequest;
  * @date: 2022年6月23日 下午8:54:56
  * @version: V1.0
  */
-@Configuration
-@EnableScheduling
+//@Configuration
+//@EnableScheduling
 public class ArticleSmsUtil {
 
 	@Value("${sms.custom}")

nngkxxdp/src/main/resources/mapper/SmsMessageDao.xml

@@ -155,7 +155,7 @@
 			SELECT t.deptid, t.deptname, t.main_leader, t.main_leader_phone, t.leaderperson, t.leaderphone,t.workperson,t.workphone, 
 				substring_index(substring_index(t.have_chnlid, ',', b.help_topic_id + 1), ',', - 1) AS chnlid
 			FROM t_dept t
-			INNER JOIN mysql.help_topic b ON b.help_topic_id < (length(t.have_chnlid) - length(REPLACE(t.have_chnlid, ',', '')) + 1)
+			INNER JOIN mysql.help_topic b ON b.help_topic_id &lt; (length(t.have_chnlid) - length(REPLACE(t.have_chnlid, ',', '')) + 1)
 		) a
 		inner JOIN column_relation c ON a.CHNLID = c.CHNLID AND c.frequency > 0
 		inner JOIN (

nngkxxdp/src/main/resources/static/district/css/sy.css

@@ -546,7 +546,7 @@ body {
 
 .show-fourth>.title-second {
 	width: 25%;
-    margin: 5px auto 0;
+    margin: 0px auto 0;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -555,6 +555,7 @@ body {
 	position: fixed;
 	background-color: #FFF;
 	left: 0;
+	padding: 10px 1% 10px;
 }
 
 .show-fifth {
@@ -574,7 +575,7 @@ body {
 .search-result {
 	width: 86%;
 	margin: 0px auto 0;
-	padding: 80px 0 0 0;
+	padding: 50px 0 0 0;
 }
 
 .textSecond {