Merge branch 'hive2.0' into api

jyy

2021-01-25 dc1a4670261bc852f643d19a83ffc53eeac1b902

 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;

/**