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

yujian

2020-05-14 4397fa6607ac892fa86c9d6e73dc9bbd94d0df7b

 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;