Merge branch 'dev_oracle_sherlock' into 'dev_oracle'

Dev oracle sherlock

See merge request root/atms!189

atms-api/src/main/java/pwc/taxtech/atms/service/impl/TemplateGroupServiceImpl.java

@@ -355,6 +355,7 @@ public class TemplateGroupServiceImpl extends AbstractService {
                     Row row = temp.getRow(j);
                     for(int k = row.getFirstCellNum(); k < row.getLastCellNum(); k++){
                         Cell cell = row.getCell(k);
+                        cell.setCellType(CellType.STRING);
                         if(!cell.getCellStyle().getLocked() && StringUtils.isNotBlank(cell.getStringCellValue())
                         && cell.getStringCellValue().equalsIgnoreCase("${KeyIn}")){
                             cell.setCellValue("");