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

amos-boot-module/amos-boot-module-biz/amos-boot-module-fas-biz/src/main/java/com/yeejoin/amos/fas/business/controller/CommonController.java

@@ -178,6 +178,7 @@ public class CommonController extends AbstractBaseController {
         return CommonResponseUtil.success(users);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "查询公司下的风险模型（厂区、区域、风险点）")
     @GetMapping(value = "/riskSource/list/{orgCode}",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public CommonResponse getRiskSourceList(@PathVariable String orgCode){

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchPaperServiceImpl.java

@@ -524,7 +524,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
                 case "feedback_result":
                     if (StringUtils.isNotBlank(dispatchRepairFeedbackDto.getFeedbackResult())) {
                         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
-                        queryWrapper.eq("type", "FKJG").eq("code", dispatchRepairFeedbackDto.getFeedbackResult());
+                        queryWrapper.eq("type", "WXJG").eq("code", dispatchRepairFeedbackDto.getFeedbackResult());
                         DataDictionary feedbackType = iDataDictionaryService.getOne(queryWrapper);
                         alertFormValue.setFieldValue(feedbackType.getName());
                         alertFormValue.setFieldValueCode(feedbackType.getCode());