Merge branch 'refs/heads/250115-realNameAndinformation-optimization' into container-test

add_notice_type_field.sql

@@ -6,4 +6,8 @@ ADD COLUMN `notice_type` tinyint(2) NOT NULL DEFAULT '1' COMMENT '须知类型 1
 UPDATE `kylin_buy_notice` SET `notice_type` = 1 WHERE `notice_type` IS NULL OR `notice_type` = 0;
 
 -- 添加索引
-ALTER TABLE `kylin_buy_notice` ADD INDEX `idx_notice_type` (`notice_type`);
+ALTER TABLE `kylin_buy_notice` ADD INDEX `idx_notice_type` (`notice_type`);
\ No newline at end of file
+
+alter table kylin_buy_notice
+    modify message varchar(500) default '' not null comment '内容';
+

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/notices/notices.html

@@ -37,9 +37,9 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:notices:create">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="removeAllNotices()" shiro:hasPermission="kylin:notices:delete">
-                删除
-            </a>
+<!--            <a class="btn btn-danger multiple disabled" onclick="removeAllNotices()" shiro:hasPermission="kylin:notices:delete">-->
+<!--                删除-->
+<!--            </a>-->
         </div>
         <div class="col-sm-12 select-table table-bordered">
             <table id="bootstrap-table"></table>
@@ -61,13 +61,14 @@
             removeUrl: prefix + "/delete",
             detailUrl: prefix + "/detail/{id}",
             modalName: "须知",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'buyNoticeId',
-                    title: 'ID'
-                },
+            columns: [
+            //     {
+            //     checkbox: true
+            // },
+                // {
+                //     field: 'buyNoticeId',
+                //     title: 'ID'
+                // },
                 {
                     field: 'imgUrl',
                     title: '图标',