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

jyy

2021-01-09 58508692587d5d99ae905e8f1e4e4249ffb3b08a

 zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java

@@ -12,6 +12,8 @@

import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.util.List;

/**