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

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreDictApiServiceImpl.java

@@ -66,8 +66,10 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
     public ServiceResponse<StoreDictDTO> getStoreDict(String categoryCode, String code) {
         BizdictDTO dto = this.bizdictService.getByCode(categoryCode, code);
         StoreDictDTO storeDictDTO = new StoreDictDTO();
-        storeDictDTO.setKey(dto.getName());
-        storeDictDTO.setValue(dto.getValueContent());
+        if (dto != null) {
+            storeDictDTO.setKey(dto.getName());
+            storeDictDTO.setValue(dto.getValueContent());
+        }
         return EnterpriseServiceResponse.success(storeDictDTO);
     }
 

gic-store-web/src/main/java/com/gic/store/web/utils/ExcelUtils.java

@@ -248,7 +248,7 @@ public class ExcelUtils {
 
     public static Workbook getWorkbookFromUpload(InputStream inputStream, String fileName) throws IOException {
         Workbook wb;
-        String fileType = fileName.substring(fileName.lastIndexOf(".")) + 1;
+        String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
         if (Constants.XLSX.equals(fileType)) {
             wb = new XSSFWorkbook(inputStream);
         } else if (Constants.XLS.equals(fileType)) {