Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -272,6 +272,8 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 if(0 == questionType.getIsShow()){
                     inspectionFile.setMark(MarkEnum.NOTVALID.getCode());
                     log.info("修改问题mark值mark={}",inspectionFile.getMark());
+                }else {
+                    inspectionFile.setMark(MarkEnum.VALID.getCode());
                 }
                 return inspectionFile;
             }).collect(Collectors.toList());

tuoheng-service/tuoheng-admin/src/main/resources/application-test.yml

@@ -139,7 +139,7 @@ tuoheng:
   # DSP服务域名
   dsp-domain-url: http://172.15.1.11:7011
   # DSP服务实例Id
-  dsp-service-inst-id: b1fa285f1c2567f02066b365dc84e069
+  dsp-service-inst-id: 7f0bf90b667c35fb716264b8a0402531
   # DSP回调地址
   dsp-callback-url: https://freeway-test.t-aaron.com/freeway/admin/dsp/callback/{requestId}
   #飞手平台地址