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/IntegerIdentityEntity.java

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

@@ -16,7 +16,7 @@ import java.util.Date;
*
*/
@Entity
@Table(name = "wlyy_prescription_expressage_log")
@Table(name = "wlyy_expressage_log")
public class WlyyPrescriptionExpressageLogDO extends UuidIdentityEntity {
    /**