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

style24.admin/src/main/java/com/style24/admin/biz/dao/TsaDeliveryDao.java

@@ -21,7 +21,7 @@ public interface TsaDeliveryDao {
 	 * @param delivery - 배송정보
 	 * @return Collection<Delivery>
 	 * @author moon
-	 * @since 2020. 11. 05
+	 * @since 2020. 11.05
 	 */
 	Collection<Delivery> getDeliveryList(Delivery delivery);
 
@@ -106,7 +106,7 @@ public interface TsaDeliveryDao {
 	/**
 	 * 배송/회수지시 목록
 	 *
-	 * @param Delivery - 배송/회수지시 정보
+	 * @param delivery - 배송/회수지시 정보
 	 * @return Collection<Delivery>
 	 * @author moon
 	 * @since 2020. 11. 11