Merge remote-tracking branch 'origin/test'

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -37,6 +37,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysDept::getDelFlag, 0);
         lqw.likeRight(SysDept::getId, deptId);
+        lqw.orderByDesc(SysDept::getOrderNum);
         List<SysDept> sysDeptList = list(lqw);
         Map<String, List<SysDept>> map = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getParentId));
         sysDeptList.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));

src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -523,7 +523,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);
         quoteRespVo.setCompanyId(orderNo);
         //添加调用费用匹配功能
-//        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), insAreaCompany.getId());
+        feeRuleSchemeService.dealFeeOrderInfo(quoteInfoVo, quoteRespVo, ptlAgreementAttribution.getId(), insAreaCompany.getId());
         return HttpResult.ok("报价成功", quoteRespVo);
     }
 

src/main/java/com/ydtech/modules/protocol/entity/dto/PltAgreementSchemeSaveDto.java

@@ -38,3 +38,4 @@ public class PltAgreementSchemeSaveDto implements Serializable {
     }
 
 }
+