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

admin

2020-03-01 c5f54810f60e036317562b1b42cfeafd18e984c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/DeviceSexServiceImpl.java

@@ -5,7 +5,6 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.dao.user.DeviceSexDao;

import com.yeshi.fanli.entity.bus.homemodule.DeviceSex;