Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/BoutiqueAutoRuleService.java

@@ -16,7 +16,7 @@




import com.yeshi.fanli.entity.bus.lable.BoutiqueAutoRule;

import com.yeshi.fanli.exception.BoutiqueAutoRuleException;

import com.yeshi.fanli.exception.goods.quality.BoutiqueAutoRuleException;



public interface BoutiqueAutoRuleService {