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

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -60,7 +60,7 @@ import java.util.*;
 * 业务订单
 */
@Service
public class BusinessOrderService extends BaseJpaService {
public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,BusinessOrderDao> {
    private Logger logger = LoggerFactory.getLogger(BusinessOrderService.class);