puhui999 2e559ebe06 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product ...

# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java

2023-10-08 17:33:21 +08:00

..

main/java/cn/iocoder/yudao/framework/common

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product

2023-10-08 17:33:21 +08:00

test/java/cn/iocoder/yudao/framework/common/util/collection

增加对比新老数组的 C/U/D 对象

2023-08-06 00:25:23 +08:00