Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
# Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java # coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
This commit is contained in:
@@ -46,5 +46,5 @@ rocketmq.orderTopic=order_message
|
||||
oss.accessKeyId=LTAI5tKSnAbkEbmT6CeBwNN3
|
||||
oss.accessKeySecret=PbXOzUFwAvZ2K5zIawwa7NAJE2pFXS
|
||||
oss.endpoint=oss-cn-shanghai.aliyuncs.com
|
||||
oss.bucket=vec-coolstore
|
||||
oss.bucket=cool-store
|
||||
corp.id = 171cddee76471740
|
||||
|
||||
Reference in New Issue
Block a user