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

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyPrescriptionExpressageLogDO.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/PrescriptionDao.java

@@ -35,6 +35,7 @@ public interface PrescriptionDao extends PagingAndSortingRepository<WlyyPrescrip
    WlyyPrescriptionDO findByRealOrder(String realOrder);
    @Query("select a from WlyyPrescriptionDO a where  a.realOrder =?1 ")
    List<WlyyPrescriptionDO> findByRealOrderList(String realOrder);
    
    WlyyPrescriptionDO findByAdmNoAndRealOrder(String admno,String realOrder);