Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -559,6 +559,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode());
                     finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.DJ_TYPE.getRemarks());
                     finPaymentrecordDto.setPayRemark(busVehicleApply.getPayRemarks());
+                    finPaymentrecordDto.setCreateBySid(busVehicleApply.getCreateBySid());
                     //查询收款单位和收款账号
                     List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue

@@ -966,6 +966,7 @@ export default {
           }
           if (this.temp.customerType == '企业' && this.temp.name.length < 5) {
             this.$message({ showClose: true, type: 'error', message: '因客户类型为企业,客户名称的长度应不少于5个汉字' })
+            return
           }
           if (this.stateId === '0') {
             this.temp.dto1 = this.templooke // this.templooke这个是运营的数据源

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -81,5 +81,7 @@ public class FinPaymentrecordDto implements Dto {
 
     @ApiModelProperty("供应商编码")
     private String payCode;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 
 }