Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4

# Conflicts:
#	ym-packing/pom.xml

ym-packing/src/main/java/com/cnbm/packing/dto/WoPowerLevelDTO.java

@@ -27,7 +27,7 @@ public class WoPowerLevelDTO implements Serializable {
 	private Long id;
 
 	@ApiModelProperty(value = "功率等级名称，（现场人员手动录入）")
-	private Integer powerClass;
+	private String powerClass;
 
 	@ApiModelProperty(value = "pmpp_low,（现场人员手动录入）")
 	private Float pmppLow;