FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
This commit is contained in:
2510220824
2022-02-17 14:17:28 +08:00
parent a6cee426de 3459fa04aa
commit 97e82b0248
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+1 -2
View File
@@ -89,7 +89,6 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
@ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
@GetMapping("/getSarStandardsInfoPage")
@EpcLog(description = "国内库或国外库查询",businessType = BusinessType.SEARCH)
//@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")
public ResponseMessage<PageInfo<SarStandardsInfo>> getSarStandardsInfoPage(SarStandardsInfoEOPage page,@RequestParam(defaultValue = "0") String mark) throws Exception {
if (null != page.getNowOrderBy()) {
@@ -507,7 +506,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
@ApiOperation(value = "|SarStandardsInfoEO|详情")
@GetMapping("/getStandInfoById")
//@RequiresPermissions("lawss:sarStandardsInfo:get")
@EpcLog(description = "国内详情查询",businessType = BusinessType.SEARCH,speclaiFlag = "1",speclaiValue = "查询详情")
public ResponseMessage<SarStandardsInfo> find(String id) throws Exception {
SarStandardsInfo result = sarStandardsInfoEOService.selectStandardsInfoByKey(id);
return Result.success(result);
adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
+4 -2
View File
@@ -1,7 +1,6 @@
package com.adc.da.slrs.sysLog.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,7 +29,7 @@ public class SysLog extends BaseEntity {
private String userId;
@ApiModelProperty(value = "操作时间")
private String operTime;
private DateTime operTime;
@ApiModelProperty(value = "操作类型")
private String oper;
@@ -56,6 +55,9 @@ public class SysLog extends BaseEntity {
@ApiModelProperty(value = "接口耗时")
private int runTime;
@ApiModelProperty(value = "特殊处理的接口展示内容")
private String special;
@TableField(exist = false)
private String account;