Commit bee05d93 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.6.2' into MVP1.6.2

parents 76af9b1b dd84caff
...@@ -70,7 +70,7 @@ public class TSalaryStandardOriginalController { ...@@ -70,7 +70,7 @@ public class TSalaryStandardOriginalController {
* @return * @return
*/ */
@Operation(description = "简单分页查询") @Operation(description = "简单分页查询")
@GetMapping("/pageApply") @GetMapping("/page")
public R<IPage<TSalaryStandardOriginal>> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) { public R<IPage<TSalaryStandardOriginal>> getTSalaryStandardOriginalPage(Page<TSalaryStandardOriginal> page, TSalaryStandardOriginal tSalaryStandardOriginal) {
tSalaryStandardOriginal.setDeleteFlag(CommonConstants.ZERO_INT); tSalaryStandardOriginal.setDeleteFlag(CommonConstants.ZERO_INT);
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
...@@ -155,8 +155,8 @@ public class TSalaryStandardOriginalController { ...@@ -155,8 +155,8 @@ public class TSalaryStandardOriginalController {
* @Date: 2024/4/2 18:02 * @Date: 2024/4/2 18:02
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
**/ **/
@SysLog("原表识别配置保存") @SysLog("原表识别配置新增")
@Operation(description = "保存") @Operation(description = "新增")
@PostMapping("/doSave") @PostMapping("/doSave")
public R<String> doSave(@RequestBody SalaryOriginalVo vo) throws IOException { public R<String> doSave(@RequestBody SalaryOriginalVo vo) throws IOException {
TSalaryStandardOriginal tSalaryStandardOriginal = vo.getSalaryOriginal(); TSalaryStandardOriginal tSalaryStandardOriginal = vo.getSalaryOriginal();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment