Merge branch 'master' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -157,4 +157,7 @@ GoodsQueryBo extends BaseEntity {
 
 	@ApiModelProperty("排序模式 1默认 2价格从低到高 3价格从高到低")
 	private Integer sortType;
+
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }