Merge remote-tracking branch 'origin/master'

doum

21 小时以前 a76e2318dd2731ff713df6e262396a9175d029f7

 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);

}