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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java

@@ -617,7 +617,7 @@ public class UnitInfoController extends BaseController {
         Collection<GroupModel> children =  feignClientResult.getResult();
         Collection<GroupModel> chil =new ArrayList<>();
         for (GroupModel child : children) {
-            if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())){
+            if("户用光伏-经销商-管理员".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())||"户用光伏-经销商-空角色".equals(child.getGroupName())){
             //排除其余角色
             }else{
                 chil.add(child);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -1184,7 +1184,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         RegionalCompanies  regionalCompanies=regionalCompaniesMapper.selectOne(qu);
         preparationMoney.setConsignee(regionalCompanies.getConsignee());
         preparationMoney.setPhone(regionalCompanies.getPhone());
-
+        preparationMoney.setConsigneeRegionCode(regionalCompanies.getConsigneeRegionCode());
+        preparationMoney.setAddress(regionalCompanies.getAddress());
         List<DocumentStation> stations = new ArrayList<>();
         peasantHouseholds.forEach(e->{
             DocumentStation documentStation = new DocumentStation();