Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
dsk-cr20g
Commits
fa0046e3
Commit
fa0046e3
authored
Aug 14, 2023
by
huangjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
156c8f1e
9c0a8459
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
JskCombineInfoController.java
.../com/dsk/web/controller/dsk/JskCombineInfoController.java
+1
-1
SysUserMapper.xml
...system/src/main/resources/mapper/system/SysUserMapper.xml
+1
-0
No files found.
dsk-admin/src/main/java/com/dsk/web/controller/dsk/JskCombineInfoController.java
View file @
fa0046e3
...
@@ -60,7 +60,7 @@ public class JskCombineInfoController extends BaseController {
...
@@ -60,7 +60,7 @@ public class JskCombineInfoController extends BaseController {
/**
/**
* 集团成员资质列表
* 集团成员资质列表
*/
*/
@PostMapping
(
"/me
n
ber/certificateList"
)
@PostMapping
(
"/me
m
ber/certificateList"
)
public
TableDataInfo
menberCertificateList
(
@RequestBody
JskCombineCertificateDto
dto
)
throws
Exception
{
public
TableDataInfo
menberCertificateList
(
@RequestBody
JskCombineCertificateDto
dto
)
throws
Exception
{
return
baseService
.
menberCertificateList
(
dto
);
return
baseService
.
menberCertificateList
(
dto
);
}
}
...
...
dsk-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @
fa0046e3
...
@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</if>
<!-- 数据范围过滤 -->
<!-- 数据范围过滤 -->
${params.dataScope}
${params.dataScope}
order by u.create_time desc
</select>
</select>
<select
id=
"selectAllocatedList"
parameterType=
"SysUser"
resultMap=
"SysUserResult"
>
<select
id=
"selectAllocatedList"
parameterType=
"SysUser"
resultMap=
"SysUserResult"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment