flowerbackend-v2.git

flowerbackend-v2

Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-02 0d864c9bf892fd7c56600e197072e07c57847b34

分支
用户	gongzuming <gongzuming>
	星期一, 九月 2, 2024 14:07 +0800
提交者	gongzuming <gongzuming>
	星期一, 九月 2, 2024 14:07 +0800
提交	0d864c9bf892fd7c56600e197072e07c57847b34
目录	c368081811fd096bd6c7e7d9fdf7eee51d0115f9 目录 \| zip \| gz
上一版本	6d943721ed2c41de272450143d6e204e7c4bc446 查看 \| 对比 c4017669a3fb411214e2716a5f11dc1a3c5e0a58 查看 \| 对比

Merge remote-tracking branch 'origin/master' into master-v2

# Conflicts:
#	src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java
#	src/main/java/com/mzl/flower/service/customer/CustomerService.java

已修改3个文件

	src/main/java/com/mzl/flower/mapper/partner/PartnerMapper.java	2 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/customer/CustomerService.java	29 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/partner/PartnerMapper.xml	8 ●●●●● 对比 \| 查看 \| 原始文档 \| blame \| 历史