YunaiV a46b86fa62 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/CrmBusinessController.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessSaveReqVO.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.http # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/statistics/CrmStatisticsCustomerMapper.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessService.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/business/CrmBusinessServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerService.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/customer/CrmCustomerServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerService.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPortraitServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/util/CrmPermissionUtils.java # yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml # yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml # yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponTemplateMapper.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java # yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java # yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.java # yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/config/JmReportConfiguration.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java		2024-05-04 09:53:54 +08:00
..
yudao-common	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-05-04 09:53:54 +08:00
yudao-spring-boot-starter-biz-data-permission	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-04 10:04:32 +08:00
yudao-spring-boot-starter-biz-ip	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-02 20:38:45 +08:00
yudao-spring-boot-starter-biz-tenant	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-02 20:38:45 +08:00
yudao-spring-boot-starter-excel	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-24 22:32:49 +08:00
yudao-spring-boot-starter-job	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-22 19:02:13 +08:00
yudao-spring-boot-starter-monitor	⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护	2023-12-08 22:17:52 +08:00
yudao-spring-boot-starter-mq	修改 rabbitmq 序列化方式，使用 Jackson2JsonMessageConverter 替代	2024-04-16 09:17:11 +08:00
yudao-spring-boot-starter-mybatis	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-05-04 09:39:07 +08:00
yudao-spring-boot-starter-protection	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-11 22:45:07 +08:00
yudao-spring-boot-starter-redis	【增强】一键改包：支持 site、org 等包	2024-04-29 00:18:39 +08:00
yudao-spring-boot-starter-security	【增强】一键改包：支持 site、org 等包	2024-04-29 00:18:39 +08:00
yudao-spring-boot-starter-web	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-05-04 09:53:54 +08:00
yudao-spring-boot-starter-websocket	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2023-12-29 12:49:13 +08:00
pom.xml	Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro	2024-04-04 02:24:42 +08:00