Merge remote-tracking branch 'origin/master'

doum

12 小时以前 417e33605dda0f28366a1d6e13c41198a156e3a7

 server/dmmall_service/src/main/java/com/doumee/service/business/LabelsService.java

@@ -135,6 +135,6 @@
     */
    List<LabelsResponse> getGoodsLabels(Integer parentId);

    List<LabelsResponse> getGoodsLabelsByType(Integer type);
    List<LabelsResponse> getGoodsLabelsByType(Integer type,Integer parentId);

}