Merge branch 'dev-smile' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev-smile

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html

@@ -47,7 +47,7 @@
                 checkbox: true
             },
                 {
-                    field: 'id',
+                    field: 'uid',
                     title: '用户id'
                 },
                 {
@@ -74,7 +74,7 @@
                 },
                 {
                     field: 'birthday',
-                    title: '年龄'
+                    title: '生日'
                 },
                 {
                     field: 'phone',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/list.html

@@ -46,7 +46,7 @@
                 checkbox: true
             },
                 {
-                    field: 'id',
+                    field: 'uid',
                     title: '用户id'
                 },
                 {
@@ -73,7 +73,7 @@
                 },
                 {
                     field: 'birthday',
-                    title: '年龄'
+                    title: '生日'
                 },
                 {
                     field: 'phone',

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql

@@ -9,7 +9,6 @@
         add agent_status int default 1 comment '代理状态[1-开启|2-关闭]';
     alter table kylin_order_ticket_relations
         add agent_distributions decimal (8,3) default 0 comment '票提';
-
     alter table kylin_order_ticket_relations
         add agent_id_master varchar (64) default "" comment '总代id';
     alter table kylin_order_ticket_relations