处理冲突，修改pom打包配置

dsk-admin/pom.xml

@@ -78,7 +78,7 @@
                 </configuration>
            </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>dsk-operate-sys</finalName>
     </build>
 
 </project>

dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsPageDto.java

@@ -26,17 +26,6 @@ public class SpecialPurposeBondsPageDto extends BasePage {
      */
     private Integer areaId;
 
-    /**
-     * 市Id
-     */
-    private Integer cityId;
-
-    /**
-     * 区Id
-     */
-    private Integer areaId;
-
-
     /**
      * 排序字段 默认-投资金额
      */