Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc
# Conflicts: # src/main/resources/application.properties # src/main/resources/quartz.properties
Showing
src/main/webapp/HG/BI/HGBI011.js
0 → 100644
src/main/webapp/HG/BI/HGBI011.jsp
0 → 100644
src/main/webapp/HG/CW/HGCW010F.js
0 → 100644
src/main/webapp/HG/CW/HGCW010F.jsp
0 → 100644
src/main/webapp/HG/PZ/HGPZ022.js
0 → 100644
src/main/webapp/HG/PZ/HGPZ022.jsp
0 → 100644
src/main/webapp/HG/PZ/HGPZ022A.js
0 → 100644
src/main/webapp/HG/PZ/HGPZ022A.jsp
0 → 100644
src/main/webapp/common/img/device_01.jpg
0 → 100644
203 KB