Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -59,7 +59,7 @@ public interface BaseVehicleFeign {
      * @param pq
      * @return
      */
-    @ApiOperation("车辆信息按照组织层级分页查询")
+    @ApiOperation("车辆信息按照组织层级分页查询 ")
     @PostMapping("/pagerListByOrgSidPath")
     public ResultBean<PagerVo<BaseVehicleVo>> pagerListByOrgSidPath(@RequestBody PagerQuery<BaseVehicleQuery> pq);
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -55,7 +55,7 @@ import org.springframework.web.bind.annotation.*;
         fallback = FinCollectionConfirmationFeignFallback.class)
 public interface FinCollectionConfirmationFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表 ")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<FinCollectionConfirmationQuery> pq);
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java

@@ -19,7 +19,7 @@ import java.util.List;
         fallback = SysProUrlFeignFallBack.class)
 public interface SysProUrlFeign {
     /**
-     * 查询流程业务表单url对象
+     * 查询流程业务表单url对 象
      */
     @PostMapping("/list")
     public ResultBean<PagerVo<SysProUrlVo>> list(@RequestBody PagerQuery<SysProUrlQuery> pq);

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -30,8 +30,8 @@ public enum ProcDefEnum {
     FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"),
     FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"),
     BUSDELIVEREDAPPLY("出库申请","process_wgt1n66l:2:357504"),
-    //BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:707504"), //测试调账流程定义id
-    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:687504"),//正式调账流程定义id
+    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:707504"), //测试调账流程定义id
+//    BASEACCADJAPPLY("调账申请","process_r6pyzqoz:1:687504"),//正式调账流程定义id
     BASESHUNINVOICAPPLY("调车开票申请","process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请","process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请","process_qegarc7r:1:535004"),

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java

@@ -39,7 +39,7 @@ import java.util.Map;
         fallback = SysUserFeignFallback.class)
 public interface SysUserFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表 ")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysUserVo>> listPage(@RequestBody PagerQuery<SysUserQuery> pq);
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java

@@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.*;
         fallback = ScmVehicleExamineFeignFallback.class)
 public interface ScmVehicleExamineFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("根据条件分页查询数据的列表 ")
     @PostMapping("/listPage")
     @ResponseBody
     public ResultBean<PagerVo<ScmVehicleExamineVo>> listPage(@RequestBody PagerQuery<ScmVehicleExamineQuery> pq);