Merge branch 'develop' into bin2107

src/main/webapp/WEB-INF/views/common/fragments/variables.html

@@ -25,6 +25,7 @@ var _imgUrl = [[${@environment.getProperty('domain.image')}]];
 var _sampleUrl = [[${@environment.getProperty('upload.sample.view')}]];
 var _uploadDefaultUrl = [[${@environment.getProperty('upload.default.view')}]];
 var _goodsUrl = [[${@environment.getProperty('upload.goods.view')}]];
+var _kollusMediaUrl = [[${kollusMediaUrl}]];
 
 var _today = [[${#calendars.format(#calendars.createNow(), 'yyyy-MM-dd')}]];
 var _thisYear = [[${#calendars.format(#calendars.createNow(), 'yyyy')}]];