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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/workflow/feign/WorkflowFeignService.java

@@ -13,7 +13,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import feign.Response;
 
-@FeignClient(name = "AMOS-API-WORKFLOW-chenhao", path = "workflow", configuration =
+@FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration =
 		{ CommonMultipartSupportConfig.class })
 public interface WorkflowFeignService {
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -263,7 +263,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
                 // 第一次保存隐患提交记录
                 LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId,
                         flowJson, latentDanger.getId(), role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(),
-                        latentDanger.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
+                        latentDanger.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), ExecuteTypeEnum.通过.getCode());
                 latentDanger.setCurrentFlowRecordId(inputRecord.getId());
                 latentDanger.setInstanceId(instance.getString("id"));
                 latentDangerMapper.updateById(latentDanger);