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

# Conflicts:
#	src/main/java/com/dpkj/modules/cardReader/service/impl/CardReaderServiceImpl.java
#	src/main/java/com/dpkj/modules/cardReader/utils/CardReaderSdk.java

src/main/java/com/dpkj/modules/cardReader/utils/CardReaderSdk.java

@@ -415,4 +415,4 @@ public interface CardReaderSdk extends Library {
      * @return
      */
     Long iReadCardBas_HSM_Step2(String pKey, byte[] outParam);
-}
+}