Merge branch 'api' into order_reform

wzy

2021-01-10 16da0ad1fda1dffa3019425a6887d38ed4217f44

 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;

/**