Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -76,7 +76,7 @@
                             <#if machineProduceType == 1>
                                 <option value ="1" selected>净水机</option>
                             <#else >
-                                <option value ="1">净水机<</option>
+                                <option value ="1">净水机</option>
                             </#if>
                             <#if machineProduceType == 2>
                                 <option value ="2" selected>冲奶机</option>