Merge branch 'dev' into rate

src/main/java/com/izouma/wenlvju/dto/RateDTO.java

@@ -93,7 +93,9 @@ public class RateDTO {
             this.gradingOrganization = gradingOrganization;
             this.code = organization.getCode();
             String address = "南京市" + organization.getDistrict();
-            if (StrUtil.isNotBlank(organization.getAddress())) {
+            if (rate.isChange() && StrUtil.isNotBlank(rate.getChangeAddress())) {
+                address = rate.getChangeAddress();
+            } else if (StrUtil.isNotBlank(organization.getAddress())) {
                 address += organization.getAddress();
             }
             this.address = address;