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

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

Browse Source 
# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
This commit is contained in:
zj
2021-07-24 18:07:06 +08:00
parent e6c0056051 20850473d8
commit 55e6e0ef65
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+2 -2
View File
@@ -18,7 +18,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
@Component @Component
@FeignClient(value = "FotonLAWSSystem-zj",path="/api",url="") @FeignClient(value = "FotonLAWSSystem",path="/api",url="")
@RequestMapping("/") @RequestMapping("/")
public interface LawsUserInfoService { public interface LawsUserInfoService {
@@ -99,7 +99,7 @@ public interface LawsUserInfoService {
public ResponseMessage addProduct(@RequestBody List<SarStandardComplianceProductAssess> sarStandardComplianceProductAssesses); public ResponseMessage addProduct(@RequestBody List<SarStandardComplianceProductAssess> sarStandardComplianceProductAssesses);
@RequestMapping(value = "sarLawsDetailedList/sar-laws-detailed-list/getStandById",method = RequestMethod.POST) @PostMapping(value = "sarLawsDetailedList/sar-laws-detailed-list/getStandById")
public SarLawsDetailedList getStandById(@RequestParam("id") String id); public SarLawsDetailedList getStandById(@RequestParam("id") String id);
@PostMapping("/slrs/sar-public-idea/addSarPublicIdea") @PostMapping("/slrs/sar-public-idea/addSarPublicIdea")
src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/BusProcessName.java
+3
View File
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -47,6 +49,7 @@ public class BusProcessName implements Serializable {
private String prcNum; private String prcNum;
@TableField("CREAT_TIME") @TableField("CREAT_TIME")
@JsonFormat(timezone = "GMT+8")
private String creatTime; private String creatTime;
@TableField("CREAT_USER") @TableField("CREAT_USER")