Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java

@@ -39,7 +39,7 @@ public class RentContractFileDTO implements Serializable {
     /**
      * 文件原始名称
      */
-    private String fileName;
+    private String name;
 
     /**
      * 删除标识 0：未删除，1：删除

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java

@@ -39,7 +39,7 @@ public class RentContractFileEntity extends BaseEpmetEntity {
 	/**
 	 * 文件原始名称
 	 */
-	private String fileName;
+	private String name;
 
 	/**
 	 * 客户ID