diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplySzVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplySzVo.java index e56eb95992..f8b041497f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplySzVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplySzVo.java @@ -46,7 +46,7 @@ public class AppVehicleApplySzVo implements Vo { private String tarpaulinSlide; @ApiModelProperty(value = "冷藏冷机") - private String refirgerator; + private String refrigerator; @ApiModelProperty(value = "自卸式压盖版") private String selfUnHyCoPl; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml index 30654ce2a5..1f1661c291 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml @@ -69,7 +69,8 @@ ba.remarks, ba.procInstId, ba.taskId, - ba.createOrgSid as userSid + ba.createOrgSid as userSid, + ba.createOrgName from bus_vehicle_apply ba where sid = #{sid} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-pro.yml b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-pro.yml index b6c7604c9e..5e3a53ba15 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/resources/application-pro.yml +++ b/anrui-flowable/anrui-flowable-biz/src/main/resources/application-pro.yml @@ -20,3 +20,9 @@ spring: password: 123456 port: 6379 timeout: 0 # 连接超时时间(毫秒) + +image: + upload: + path: D:\anrui\upload\ + url: + prefix: http://120.46.172.184/api/upload/ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplySzVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplySzVo.java index 0694e3e41f..4e908c4164 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplySzVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplySzVo.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.supplychain.vehicleApply; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,7 +47,8 @@ public class VehicleApplySzVo implements Vo { private String tarpaulinSlide; @ApiModelProperty(value = "冷藏冷机") - private String refirgerator; + @JsonProperty("refirgerator") + private String refrigerator; @ApiModelProperty(value = "自卸式压盖版") private String selfUnHyCoPl;