diff --git a/app/operate/service/dto/org_ad.go b/app/operate/service/dto/org_ad.go
index 1d9d429efdfcc60b7cdbb36f6d91e8dd30725852..26b65ea0a0bd9179f4ca42dc6726e011b0c0c57c 100644
--- a/app/operate/service/dto/org_ad.go
+++ b/app/operate/service/dto/org_ad.go
@@ -9,10 +9,10 @@ import (
type OrgAdGetPageReq struct {
dto.Pagination `search:"-"`
- adName string `form:"adName" search:"type:contains;column:ad_name;table:org_ad"`
- StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_ad" comment:"寮€濮嬫椂闂�"`
- EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_ad" comment:"缁撴潫鏃堕棿"`
- Status string `form:"status" search:"type:exact;column:status;table:org_ad"`
+ AdName string `form:"adName" search:"type:contains;column:ad_name;table:org_ad"` //骞垮憡鍚嶇О
+ StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_ad" comment:"寮€濮嬫椂闂�"` //寮€濮嬫椂闂�
+ EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_ad" comment:"缁撴潫鏃堕棿"` //缁撴潫鏃堕棿
+ Status string `form:"status" search:"type:exact;column:status;table:org_ad"` //骞垮憡绫诲瀷
}
type OrgAdOrder struct {
diff --git a/app/operate/service/dto/org_news.go b/app/operate/service/dto/org_news.go
index 160dce72638ad97c7ee619a57e131775933eddb7..8875cfcd4d06053e225f42ef236a917fbf95e14b 100644
--- a/app/operate/service/dto/org_news.go
+++ b/app/operate/service/dto/org_news.go
@@ -9,10 +9,10 @@ import (
type OrgNewsGetPageReq struct {
dto.Pagination `search:"-"`
- NewsName string `form:"newsName" search:"type:contains;column:news_name;table:org_news"`
- StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_news" comment:"寮€濮嬫椂闂�"`
- EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_news" comment:"缁撴潫鏃堕棿"`
- Status string `form:"status" search:"type:exact;column:status;table:org_news"`
+ NewsName string `form:"newsName" search:"type:contains;column:news_name;table:org_news"` //鏂伴椈鍚嶇О
+ StartTime string `form:"startTime" search:"type:gte;column:created_at;table:org_news" comment:"寮€濮嬫椂闂�"` //寮€濮嬫椂闂�
+ EndTime string `form:"endTime" search:"type:lte;column:created_at;table:org_news" comment:"缁撴潫鏃堕棿"` //缁撴潫鏃堕棿
+ Status string `form:"status" search:"type:exact;column:status;table:org_news"` //鏂伴椈鐘舵€�
}
type OrgNewsOrder struct {
diff --git a/docs/docs.go b/docs/docs.go
index 763cc55a40e967f44d7536357acc6277874b569b..a12b16efa0eb2494d7a157f2d6b33d0d074f0e81 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -6445,7 +6445,12 @@ var doc = `{
"dto.OrgAdGetPageReq": {
"type": "object",
"properties": {
+ "adName": {
+ "description": "骞垮憡鍚嶇О",
+ "type": "string"
+ },
"endTime": {
+ "description": "缁撴潫鏃堕棿",
"type": "string"
},
"pageIndex": {
@@ -6455,9 +6460,11 @@ var doc = `{
"type": "integer"
},
"startTime": {
+ "description": "寮€濮嬫椂闂�",
"type": "string"
},
"status": {
+ "description": "骞垮憡绫诲瀷",
"type": "string"
}
}
@@ -7256,9 +7263,11 @@ var doc = `{
"type": "object",
"properties": {
"endTime": {
+ "description": "缁撴潫鏃堕棿",
"type": "string"
},
"newsName": {
+ "description": "鏂伴椈鍚嶇О",
"type": "string"
},
"pageIndex": {
@@ -7268,9 +7277,11 @@ var doc = `{
"type": "integer"
},
"startTime": {
+ "description": "寮€濮嬫椂闂�",
"type": "string"
},
"status": {
+ "description": "鏂伴椈鐘舵€�",
"type": "string"
}
}
@@ -8914,21 +8925,12 @@ var doc = `{
"models.SysDept": {
"type": "object",
"properties": {
- "children": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/models.SysDept"
- }
- },
"createBy": {
"type": "integer"
},
"createdAt": {
"type": "string"
},
- "dataScope": {
- "type": "string"
- },
"deptId": {
"description": "閮ㄩ棬缂栫爜",
"type": "integer"
@@ -8948,9 +8950,6 @@ var doc = `{
"description": "璐熻矗浜�",
"type": "string"
},
- "params": {
- "type": "string"
- },
"parentId": {
"description": "涓婄骇閮ㄩ棬",
"type": "integer"
@@ -8981,9 +8980,21 @@ var doc = `{
"action": {
"type": "string"
},
+ "apis": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"breadcrumb": {
"type": "string"
},
+ "children": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.SysMenu"
+ }
+ },
"component": {
"type": "string"
},
@@ -8993,12 +9004,18 @@ var doc = `{
"createdAt": {
"type": "string"
},
+ "dataScope": {
+ "type": "string"
+ },
"icon": {
"type": "string"
},
"isFrame": {
"type": "string"
},
+ "is_select": {
+ "type": "boolean"
+ },
"menuId": {
"type": "integer"
},
@@ -9011,6 +9028,9 @@ var doc = `{
"noCache": {
"type": "boolean"
},
+ "params": {
+ "type": "string"
+ },
"parentId": {
"type": "integer"
},
@@ -9023,6 +9043,9 @@ var doc = `{
"permission": {
"type": "string"
},
+ "roleId": {
+ "type": "integer"
+ },
"sort": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index 56fb80474d1caf0f6a9879127718647ed5281f98..3c042148b1b0ec3f0aa4f2d36541b2e3655b1366 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -6428,7 +6428,12 @@
"dto.OrgAdGetPageReq": {
"type": "object",
"properties": {
+ "adName": {
+ "description": "骞垮憡鍚嶇О",
+ "type": "string"
+ },
"endTime": {
+ "description": "缁撴潫鏃堕棿",
"type": "string"
},
"pageIndex": {
@@ -6438,9 +6443,11 @@
"type": "integer"
},
"startTime": {
+ "description": "寮€濮嬫椂闂�",
"type": "string"
},
"status": {
+ "description": "骞垮憡绫诲瀷",
"type": "string"
}
}
@@ -7239,9 +7246,11 @@
"type": "object",
"properties": {
"endTime": {
+ "description": "缁撴潫鏃堕棿",
"type": "string"
},
"newsName": {
+ "description": "鏂伴椈鍚嶇О",
"type": "string"
},
"pageIndex": {
@@ -7251,9 +7260,11 @@
"type": "integer"
},
"startTime": {
+ "description": "寮€濮嬫椂闂�",
"type": "string"
},
"status": {
+ "description": "鏂伴椈鐘舵€�",
"type": "string"
}
}
@@ -8897,21 +8908,12 @@
"models.SysDept": {
"type": "object",
"properties": {
- "children": {
- "type": "array",
- "items": {
- "$ref": "#/definitions/models.SysDept"
- }
- },
"createBy": {
"type": "integer"
},
"createdAt": {
"type": "string"
},
- "dataScope": {
- "type": "string"
- },
"deptId": {
"description": "閮ㄩ棬缂栫爜",
"type": "integer"
@@ -8931,9 +8933,6 @@
"description": "璐熻矗浜�",
"type": "string"
},
- "params": {
- "type": "string"
- },
"parentId": {
"description": "涓婄骇閮ㄩ棬",
"type": "integer"
@@ -8964,9 +8963,21 @@
"action": {
"type": "string"
},
+ "apis": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ },
"breadcrumb": {
"type": "string"
},
+ "children": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/models.SysMenu"
+ }
+ },
"component": {
"type": "string"
},
@@ -8976,12 +8987,18 @@
"createdAt": {
"type": "string"
},
+ "dataScope": {
+ "type": "string"
+ },
"icon": {
"type": "string"
},
"isFrame": {
"type": "string"
},
+ "is_select": {
+ "type": "boolean"
+ },
"menuId": {
"type": "integer"
},
@@ -8994,6 +9011,9 @@
"noCache": {
"type": "boolean"
},
+ "params": {
+ "type": "string"
+ },
"parentId": {
"type": "integer"
},
@@ -9006,6 +9026,9 @@
"permission": {
"type": "string"
},
+ "roleId": {
+ "type": "integer"
+ },
"sort": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 8f5fe22fc9249334c328426ad3d7204dfa4adb29..ab8f22d2f8d7cb3a9cdc96b9ddb4aa7f8628d596 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -8,15 +8,21 @@ definitions:
type: object
dto.OrgAdGetPageReq:
properties:
+ adName:
+ description: 骞垮憡鍚嶇О
+ type: string
endTime:
+ description: 缁撴潫鏃堕棿
type: string
pageIndex:
type: integer
pageSize:
type: integer
startTime:
+ description: 寮€濮嬫椂闂�
type: string
status:
+ description: 骞垮憡绫诲瀷
type: string
type: object
dto.OrgAdInsertReq:
@@ -547,16 +553,20 @@ definitions:
dto.OrgNewsGetPageReq:
properties:
endTime:
+ description: 缁撴潫鏃堕棿
type: string
newsName:
+ description: 鏂伴椈鍚嶇О
type: string
pageIndex:
type: integer
pageSize:
type: integer
startTime:
+ description: 寮€濮嬫椂闂�
type: string
status:
+ description: 鏂伴椈鐘舵€�
type: string
type: object
dto.OrgNewsInsertReq:
@@ -1664,16 +1674,10 @@ definitions:
type: object
models.SysDept:
properties:
- children:
- items:
- $ref: '#/definitions/models.SysDept'
- type: array
createBy:
type: integer
createdAt:
type: string
- dataScope:
- type: string
deptId:
description: 閮ㄩ棬缂栫爜
type: integer
@@ -1688,8 +1692,6 @@ definitions:
leader:
description: 璐熻矗浜�
type: string
- params:
- type: string
parentId:
description: 涓婄骇閮ㄩ棬
type: integer
@@ -1711,16 +1713,28 @@ definitions:
properties:
action:
type: string
+ apis:
+ items:
+ type: integer
+ type: array
breadcrumb:
type: string
+ children:
+ items:
+ $ref: '#/definitions/models.SysMenu'
+ type: array
component:
type: string
createBy:
type: integer
createdAt:
type: string
+ dataScope:
+ type: string
icon:
type: string
+ is_select:
+ type: boolean
isFrame:
type: string
menuId:
@@ -1731,6 +1745,8 @@ definitions:
type: string
noCache:
type: boolean
+ params:
+ type: string
parentId:
type: integer
path:
@@ -1739,6 +1755,8 @@ definitions:
type: string
permission:
type: string
+ roleId:
+ type: integer
sort:
type: integer
sysApi: