Conflicts: src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java src/main/webapp/HP/SC/HPSC003.js src/main/webapp/HP/SC/HPSC003.jsp src/main/webapp/HP/SC/HPSC005.jsp
