Merge remote-tracking branch 'liujiankang/master'

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachinePartsService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachinePartsServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/MachinePartsMapper.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machinePartsMapper.xml

watero-rst-core/src/main/java/com.iamberry.rst.core/pts/PtsMachineVersion.java

@@ -19,7 +19,7 @@ public class PtsMachineVersion implements Serializable {
 
     private String machineVersionContent;//更新内容
 
-    private Integer machineVersionType;//版本类型 1：硬件版本； 2：软件版本
+    private Integer machineVersionType;//版本类型  1：软件版本
 
     private Date machineVersionCreateTime;//创建时间