SH-Arbitrate/Arbitrate-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

Browse Source
This commit was merged in pull request #221.
This commit is contained in:
hejinbo
2023-11-20 11:03:27 +08:00
committed by Gitea
parent b3a2a2af3e 36e7342d85
commit 93899d881c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java
+1 -1
View File
@@ -129,7 +129,7 @@ public class DeptIdentifyController extends BaseController {
* @return * @return
*/ */
@PostMapping("/insertTemplate") @PostMapping("/insertTemplate")
public AjaxResult insertTemplate(@RequestBody TemplateManage templateManage,@RequestParam("file") MultipartFile file){ public AjaxResult insertTemplate(TemplateManage templateManage,@RequestParam("file") MultipartFile file){
return deptIdentifyService.insertTemplate(templateManage,file); return deptIdentifyService.insertTemplate(templateManage,file);
} }
/** /**
ruoyi-system/src/main/resources/mapper/wisdomarbitrate/TemplateManageMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@
del_flag,create_time del_flag,create_time
)values( )values(
<if test="identifyId != null">#{identifyId},</if> <if test="identifyId != null">#{identifyId},</if>
<if test="sealName != null and sealName != ''">#{sealName},</if> <if test="temName != null and temName != ''">#{temName},</if>
<if test="temType != null">#{temType},</if> <if test="temType != null">#{temType},</if>
<if test="temFormat != null and temFormat != ''">#{temFormat},</if> <if test="temFormat != null and temFormat != ''">#{temFormat},</if>
<if test="temOrigPath != null and temOrigPath != ''">#{temOrigPath},</if> <if test="temOrigPath != null and temOrigPath != ''">#{temOrigPath},</if>