Merge branch 'order_fee_update' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderFeeApplication/OrderFeeApplicationDO.java

@@ -101,9 +101,9 @@ public class OrderFeeApplicationDO extends BaseDO {
      */
     private String bpmProcessId;
     /**
-     * 流程类型：1 费用申请 2 批量订单费用申请
+     * 流程类型: 1 费用申请 2 批量订单费用申请
      */
-    private String bpmType;
+    private Integer bpmType;
     /**
      * 应收ID
      */

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java

@@ -730,6 +730,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
             feeApplicationDO.setCreator(creator);
             feeApplicationDO.setUpdater(audit);
             feeApplicationDO.setUpdateTime(now);
+            feeApplicationDO.setBpmType(2);
             feeApplicationDO.setBpmProcessId(formId);
             //生成应收
             DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType()));