Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/FactoryController.java

@@ -93,7 +93,7 @@ public class FactoryController {
 
     @ApiOperation("excel批量导入")
     @PostMapping("factoryExcelImport")
-    public BaseResponse factoryExcelImport(@RequestParam("file") MultipartFile file) throws Exception {
+    public BaseResponse<ExcelImportRes> factoryExcelImport(@RequestParam("file") MultipartFile file) throws Exception {
         List<FactoryProperty> factoryPropertyList = ExcelInputFactory.getExcelPojoList(file, FactoryProperty.class);
         //excel批量导入
         ExcelImportRes result = factoryService.factoryExcelImport(factoryPropertyList);

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrVariableController.java

@@ -50,7 +50,7 @@ public class QrVariableController {
 
     @ApiOperation("码格式变量查询详情")
     @GetMapping("/getQrVariableDetail")
-    public BaseResponse getQrVariableDetail(@Validated GetQrVariableDetailReq getQrVariableDetailReq) {
+    public BaseResponse<GetQrVariableDetailRes> getQrVariableDetail(@Validated GetQrVariableDetailReq getQrVariableDetailReq) {
         GetQrVariableDetailRes result = qrVariableService.getQrVariableDetail(getQrVariableDetailReq);
         return BaseResponse.create(result);
     }