Merge branch 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud into test

* 'test' of http://172.16.46.63:30001/gitlab/base-version/ztcloud:
  [+]增加国密SM4加解密工具包
  [+]增加国密SM4接口加解密
  [#]修改部门推送消息逻辑

pom.xml

@@ -282,13 +282,13 @@
             </properties>
         </profile>
         <profile>
-            <id>chenbowen</id>
+            <id>haodongqiang</id>
             <properties>
 <!--                <env.name>local</env.name>-->
                 <env.name>dev</env.name>
                 <!--                <config.server-addr>localhost:8848</config.server-addr>-->
                 <config.server-addr>172.16.46.63:30848</config.server-addr>
-                <config.namespace>chenbowen</config.namespace>
+                <config.namespace>haodongqiang</config.namespace>
                 <config.group>DEFAULT_GROUP</config.group>
                 <config.username>nacos</config.username>
                 <config.password>P@ssword25</config.password>

sql/dm/短信渠道中铝e办支持_DM8_20260109.sql

@@ -0,0 +1,9 @@
+-- 短信渠道新增鸿联九五支持（达梦8）
+-- 1) system_sms_channel 表新增 epid 字段
+-- 2) system_sms_channel_code 字典新增 HL95 选项
+
+ALTER TABLE system_sms_channel ADD COLUMN epid VARCHAR(64);
+COMMENT ON COLUMN system_sms_channel.epid IS '企业编号(epid)';
+
+INSERT INTO system_dict_data (id, sort, label, value, dict_type, status, color_type, css_class, remark, creator, create_time, updater, update_time, deleted)
+VALUES (1593, 5, '中铝e办', 'ZLE', 'system_sms_channel_code', 0, '', '', '', '1', '2026-01-09 00:00:00', '1', '2026-01-09 00:00:00', '0');

zt-framework/zt-common/pom.xml

@@ -163,6 +163,33 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.78.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.14</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

zt-framework/zt-common/src/main/java/com/zt/plat/framework/common/pojo/PageResult.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 @Schema(description = "分页结果")
-@Data
+@Data //TODO 分页结果参考这个
 public final class PageResult<T> implements Serializable {
 
     @Schema(description = "数据", requiredMode = Schema.RequiredMode.REQUIRED)

zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java

@@ -11,7 +11,7 @@ import static com.zt.plat.framework.web.core.util.WebFrameworkUtils.HEADER_TENAN
  *
  * Producer 发送消息时，将 {@link TenantContextHolder} 租户编号，添加到消息的 Header 中
  *
- * @author ZT
+ * @author ZT TODO
  */
 public class TenantRocketMQSendMessageHook implements SendMessageHook {
 

zt-framework/zt-spring-boot-starter-mybatis/src/main/java/com/zt/plat/framework/mybatis/core/mapper/BaseMapperX.java

@@ -48,7 +48,7 @@ public interface BaseMapperX<T> extends MPJBaseMapper<T> {
             PageSumSupport.tryAttachSummary(this, queryWrapper, pageResult);
             return pageResult;
         }
-
+        //TODO 分页结果参考这个 ===============================
         // MyBatis Plus 查询
         IPage<T> mpPage = MyBatisUtils.buildPage(pageParam, sortingFields);
         selectPage(mpPage, queryWrapper);