Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
fangxinjiang
yifu-mvp
Commits
bee05d93
Commit
bee05d93
authored
Apr 03, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.2' into MVP1.6.2
parents
76af9b1b
dd84caff
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
TSalaryStandardOriginalController.java
.../salary/controller/TSalaryStandardOriginalController.java
+3
-3
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardOriginalController.java
View file @
bee05d93
...
...
@@ -70,7 +70,7 @@ public class TSalaryStandardOriginalController {
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@GetMapping
(
"/page
Apply
"
)
@GetMapping
(
"/page"
)
public
R
<
IPage
<
TSalaryStandardOriginal
>>
getTSalaryStandardOriginalPage
(
Page
<
TSalaryStandardOriginal
>
page
,
TSalaryStandardOriginal
tSalaryStandardOriginal
)
{
tSalaryStandardOriginal
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
YifuUser
user
=
SecurityUtils
.
getUser
();
...
...
@@ -155,8 +155,8 @@ public class TSalaryStandardOriginalController {
* @Date: 2024/4/2 18:02
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/
@SysLog
(
"原表识别配置
保存
"
)
@Operation
(
description
=
"
保存
"
)
@SysLog
(
"原表识别配置
新增
"
)
@Operation
(
description
=
"
新增
"
)
@PostMapping
(
"/doSave"
)
public
R
<
String
>
doSave
(
@RequestBody
SalaryOriginalVo
vo
)
throws
IOException
{
TSalaryStandardOriginal
tSalaryStandardOriginal
=
vo
.
getSalaryOriginal
();
...
...
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