Merge branch 'master' into dev/feat/partner1.3_20230904

Browse Source

# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java

...

This commit is contained in:

xiaodong.hu

2023-09-08 14:11:36 +08:00

parent 69d965407e af363be783

commit 65929c8882

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available