Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录

business/sms-service/src/main/java/com/yihu/jw/sms/service/TXYSmsService.java

@@ -20,8 +20,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
;
/**
 * Created with IntelliJ IDEA.
 *