Merge branch 'dev' of http://139.224.139.2:9091/AGSH/yd-backend into dev

yd-api/pom.xml

@@ -129,6 +129,21 @@
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <version>2.10.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
     </dependencies>
 
     <build>

yd-api/src/main/java/com/yd/dal/mapper/customer/AclFileUploadMapper.java

@@ -19,7 +19,7 @@ public interface AclFileUploadMapper {
 
     int updateByPrimaryKey(AclFileUpload record);
 
-    CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType") Integer targetType, @Param("targetUseFor")Integer targetUseFor,@Param("practitionerId") Long practitionerId);
+    CustomerFileUpload findByTargetTypeAndTargetUseForAndTargetId(@Param("targetType")Integer targetType, @Param("targetUseFor")Integer targetUseFor, @Param("practitionerId")Long practitionerId);
 
     List<AclFileUpload> findByAclFileUpload(AclFileUpload fileUpload);
 }
\ No newline at end of file