Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/persistence/domain/Alarm.java

@@ -22,4 +22,6 @@ public class Alarm extends TscBaseDomain {
 	private String fuserid;		// 사용자계정
 	private String fcallback;	// 발신자전화번호(회신번호)
 
+	private String batchNm;		// 배치명
+
 }