Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/web/TsfCommonController.java

@@ -109,19 +109,11 @@ public class TsfCommonController extends TsfBaseController {
 	 */
 	@PostMapping("/file/upload")
 	@ResponseBody
-	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException, ImageProcessingException, MetadataException {
+	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException{
 		if (StringUtils.isEmpty(policy)) {
 			policy = "default";
 		}
-		int orientation = 1;
-		Metadata metadata = ImageMetadataReader.readMetadata(convert(file));
 		
-		Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
-		if(directory != null) {
-			orientation = directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
-		}
-		
-		log.info("orientation: {}", orientation);
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload." + policy + ".target.path"), subDir);
 
 		GagaFileUploadUtil fuUtil = new GagaFileUploadUtil(targetPath, Long.parseLong(env.getProperty("upload." + policy + ".max.size")), env.getProperty("upload." + policy + ".allow.extension"), env.getProperty("upload." + policy + ".view"));

src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -834,7 +834,7 @@
 		<if test="cpnId != null and cpnId != ''">
 		AND C.CPN_ID  = #{cpnId}
 		</if>
-		AND C.CPN_TYPE IN ('G230_11','G230_30')
+		AND C.CPN_TYPE IN ('G230_11','G230_30','G230_20')
 		AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		AND NOW()  <![CDATA[<=]]>  IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
 		AND (CASE WHEN 'P' = #{frontGb} THEN C.DC_PVAL