# Conflicts:
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties

# Conflicts:
#	yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/enums/ErrorCodeConstants.java
#	yudao-module-reward/yudao-module-reward-api/src/test/java/GenRewardCodeTest.java
#	yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

Merge remote-tracking branch 'origin/feature_member_score_zhangfeng' into feature_member_score_zhangfeng

# Conflicts:
#	yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/service/reward/RewardServiceImpl.java
#	yudao-module-reward/yudao-module-reward-api/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardUpdateReqVO.java

# Conflicts:
#   yudao-module-reward/yudao-module-reward-api/pom.xml
#   yudao-module-reward/yudao-module-reward-impl/pom.xml
#   yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/config/SwaggerRewardConfiguration.java

feature-reward：基础功能

See merge request !9

feature-ecw-node:新增前端下拉框获取网点信息接口

See merge request !8

订单业绩业务修改

See merge request !7