Merge branch 'dev'

2025-10-21 17:20:07 +08:00 · 2025-09-11 11:35:16 +08:00 · 2025-09-11 10:16:01 +08:00 · 2025-02-20 16:47:12 +08:00 · 2024-12-17 16:33:18 +08:00 · 2024-12-16 17:31:35 +08:00
3 changed files with 507 additions and 2448 deletions
--- a/app/Model/MessageIm.php
+++ b/app/Model/MessageIm.php
@ -11,7 +11,7 @@ use Hyperf\Snowflake\Concern\Snowflake;

 /**
 * @property int $message_id 主键id
- * @property int $from_user_id 发送方user_id
+ * @property string $from_user_id 发送方user_id
 * @property int $to_user_id 接收方user_id
 * @property string $message_key 消息唯一标识（系统返回，撤回消息使用）
 * @property string $message_send_time 消息发送时间戳
--- a/app/Model/OrderInquiry.php
+++ b/app/Model/OrderInquiry.php
@ -50,7 +50,7 @@ use Hyperf\Snowflake\Concern\Snowflake;
 * @property int $patient_age 患者年龄-就诊人
 * @property Carbon $created_at 创建时间
 * @property Carbon $updated_at 修改时间
- * @property-read UserDoctor|null $UserDoctor 
+ * @property-read UserDoctor|null $UserDoctor
 * @property-read OrderInquiryCase|null $OrderInquiryCase 
 */
 class OrderInquiry extends Model
--- a/composer.lock
+++ b/composer.lock
Author	SHA1	Message	Date
haomingming	13202346dc	Merge branch 'dev' Some checks are pending Build Docker / build (push) Waiting to run Details	2025-10-21 17:20:07 +08:00
wucongxing8150	ce6e5fb5d1	Merge branch 'dev' Some checks failed Build Docker / build (push) Has been cancelled Details	2025-09-11 11:35:16 +08:00
wucongxing8150	73b922d8af	Merge branch 'dev' Some checks are pending Build Docker / build (push) Waiting to run Details	2025-09-11 10:16:01 +08:00
wucongxing8150	ad9e345eb3	Merge branch 'dev' Some checks failed Build Docker / build (push) Has been cancelled Details	2025-02-20 16:47:12 +08:00
wucongxing8150	3cd1d53f4a	Merge branch 'dev'	2024-12-17 16:33:18 +08:00
wucongxing8150	2fa7762d54	Merge branch 'dev'	2024-12-16 17:31:35 +08:00
wucongxing8150	714fec7f82	Merge branch 'dev'	2024-11-08 09:13:00 +08:00
wucongxing8150	6a936a8222	Merge branch 'dev'	2024-11-08 08:46:23 +08:00
wucongxing8150	d3c139a95e	Merge branch 'dev'	2024-09-04 16:28:21 +08:00
wucongxing8150	69d2e730c9	Merge branch 'dev'	2024-07-31 17:08:09 +08:00
wucongxing8150	ab58fb9326	Merge branch 'dev'	2024-06-26 15:31:07 +08:00
wucongxing8150	c2fdcd6d8b	Merge branch 'dev'	2024-06-26 15:20:27 +08:00
wucongxing8150	bdd1af5bb3	Merge branch 'dev'	2024-06-19 16:08:32 +08:00
wucongxing8150	fea5e0f3b8	Merge branch 'dev'	2024-05-31 14:12:11 +08:00
wucongxing8150	d1b796861f	Merge branch 'dev'	2024-05-27 17:53:31 +08:00
wucongxing8150	276474cbfb	Merge branch 'dev'	2024-05-20 16:23:38 +08:00
wucongxing8150	d7dd93ac6a	Merge branch 'dev'	2024-05-20 16:22:47 +08:00
wucongxing8150	f05f8e911a	获取处方订单详情增加是否转换图片字段	2024-05-17 10:57:04 +08:00
wucongxing8150	2c21fbc6f1	Merge branch 'dev'	2024-05-11 14:54:35 +08:00
wucongxing8150	4e6ad0de73	Merge branch 'dev'	2024-05-09 18:50:46 +08:00
wucongxing8150	9caeca4563	Merge branch 'master' of ssh://101.201.233.43:10022/gdxz/hospital-applets-api	2024-05-09 18:46:20 +08:00
wucongxing8150	973b1bb63c	Merge branch 'dev'	2024-05-09 18:21:46 +08:00
wucongxing8150	e723994064	1.3版本合并dev并解决冲突	2024-05-09 16:25:58 +08:00
wucongxing8150	2729e33506	1	2024-03-29 19:10:55 +08:00
wucongxing8150	7f4dc5a78c	修改认证	2024-03-29 19:10:47 +08:00
wucongxing8150	b9df31e447	更改log。修改model备注	2024-03-29 17:27:09 +08:00
wucongxing8150	1668c5382c	删除判断	2024-03-28 10:26:21 +08:00
wucongxing8150	8b4c7cc17a	修改状态	2024-03-27 18:13:34 +08:00
wucongxing8150	831e59842a	审核失败删除失败字段	2024-03-27 17:33:36 +08:00
wucongxing8150	0d173902e8	错误增加专长	2024-03-27 17:15:32 +08:00
wucongxing8150	af0f03f7e8	Merge branch 'dev'	2024-03-22 19:51:32 +08:00
wucongxing8150	e0e7338a38	Merge branch 'dev'	2024-03-22 19:04:04 +08:00
wucongxing8150	ab7f8ad295	修改下线时间问题	2024-03-18 13:05:11 +08:00
wucongxing	9b4bc2a51a	修改微信商品退款回调	2024-01-15 10:29:35 +08:00
wucongxing	4dda3ada59	修改优惠劵通知时间	2023-12-26 15:56:54 +08:00
wucongxing	aaf8ae7218	上报监管平台新增ca签名值数据	2023-12-26 15:51:23 +08:00
wucongxing	a12746fe3e	Merge branch 'dev'	2023-12-21 09:48:01 +08:00
wucongxing	832b9e6996	合并dev分支，解决冲突	2023-12-19 13:53:14 +08:00
wucongxing	89ca8470d8	修改拉取商品	2023-12-08 16:39:39 +08:00
wucongxing	b4d96fd5f5	去除打印日志	2023-12-08 14:24:36 +08:00
wucongxing	80c5d22e2e	拉取商品增加日志	2023-12-08 13:10:16 +08:00
wucongxing	a583a9fdda	修改更新处方平台商品增加药店编码识别	2023-12-07 14:03:43 +08:00
wucongxing	1d16a1265b	修改推送消息医生xx时间后还未接诊内容	2023-11-28 15:41:51 +08:00
wucongxing	bb60464a57	修改推送消息医生xx时间后还未接诊	2023-11-28 15:33:03 +08:00
wucongxing	f57a1720d2	修改消息跳转	2023-11-28 15:27:03 +08:00
wucongxing	8cbbd848f3	1	2023-11-28 15:26:53 +08:00
wucongxing	3d38ed9da4	修改医生未接诊跳转问题	2023-11-28 13:58:34 +08:00
wucongxing	b63077b223	Merge branch 'dev'	2023-11-09 18:02:56 +08:00
wucongxing	01ccb8f2c8	Merge branch 'dev'	2023-11-09 17:33:44 +08:00
wucongxing	3b4e01002e	Merge branch 'dev'	2023-11-09 17:31:46 +08:00
wucongxing	6de18e1eed	Merge branch 'dev'	2023-11-09 17:06:47 +08:00
wucongxing	ff085a574f	Merge branch 'dev'	2023-10-24 15:20:18 +08:00
wucongxing	2f34fd18ae	1	2023-10-24 15:06:30 +08:00
wucongxing	4f606c9c98	Merge branch 'dev'	2023-10-24 14:10:42 +08:00
wucongxing	516eee9738	Merge branch 'dev'	2023-10-18 11:41:56 +08:00
wucongxing	bc28579e3e	Merge branch 'dev'	2023-10-18 09:58:54 +08:00
wucongxing	9a03cb3962	合并dev	2023-10-17 09:37:06 +08:00
wucongxing	592f9cb7b4	修改机构编码为zd10003	2023-09-08 10:32:08 +08:00
wucongxing	c16cc485cd	上报处方平台编号问题修改	2023-09-07 17:13:23 +08:00
wucongxing	17d908ec86	修改lock	2023-08-10 17:25:09 +08:00
wucongxing	98c9e0a00b	修改开具处方：增加回滚。删除无用log记录，修改处方图片位置	2023-08-10 17:05:53 +08:00
wucongxing	73eb50a478	修改提现返回错误	2023-08-10 15:23:00 +08:00
wucongxing	9f8dd7c17c	修改lock文件	2023-07-28 18:24:47 +08:00
wucongxing	ba8abec869	Merge branch 'dev'	2023-07-19 09:14:58 +08:00
wucongxing	b784512a0e	Merge branch 'dev'	2023-07-19 09:08:01 +08:00
wucongxing	3f429387b2	Merge branch 'dev'	2023-07-19 08:55:18 +08:00
wucongxing	d531315fbb	Merge branch 'dev'	2023-07-15 19:12:05 +08:00
wucongxing	1ae16fa641	Merge branch 'dev'	2023-07-10 14:38:58 +08:00
wucongxing	89bc9dec11	Merge branch 'dev'	2023-07-07 17:06:15 +08:00
wucongxing	b8f835c953	Merge branch 'dev'	2023-07-07 16:21:53 +08:00
wucongxing	a55568e177	Merge branch 'dev'	2023-06-26 17:27:43 +08:00
wucongxing	074948594a	Merge branch 'dev'	2023-06-02 08:46:24 +08:00
wucongxing	05631a64c3	Merge branch 'dev'	2023-05-24 17:59:40 +08:00
wucongxing	29c3a2891d	Merge branch 'dev'	2023-05-24 16:37:50 +08:00
wucongxing	fcb5bf7c52	Merge branch 'dev'	2023-05-23 17:10:31 +08:00
wucongxing	d249f314cd	Merge branch 'dev'	2023-05-23 13:21:50 +08:00
wucongxing	1e1070fe1e	Merge branch 'dev'	2023-05-22 13:51:47 +08:00
wucongxing	fea52fb0c9	Merge branch 'dev'	2023-05-22 10:16:08 +08:00
wucongxing	1956efb874	Merge branch 'dev'	2023-05-22 09:29:22 +08:00
wucongxing	4b3d5970a1	Merge branch 'dev'	2023-05-19 16:40:11 +08:00
wucongxing	4b791f4aa5	Merge branch 'dev'	2023-05-19 14:16:01 +08:00
wucongxing	2b1f04e88f	Merge branch 'dev'	2023-05-19 13:13:33 +08:00
wucongxing	0e94079b56	Merge brant ch 'dev'	2023-05-19 11:40:31 +08:00
wucongxing	0947ac856d	Merge branch 'dev'	2023-05-19 11:32:33 +08:00
wucongxing	f82a70f2e8	Merge branch 'dev'	2023-05-19 10:22:10 +08:00
wucongxing	44e4e48ded	dad ad ad Merge branch 'dev'	2023-05-19 08:49:15 +08:00
wucongxing	21a53b23c9	Merge branch 'dev'	2023-05-18 16:22:26 +08:00
wucongxing	9131bddc51	Merge branch 'dev'	2023-05-18 16:08:34 +08:00
wucongxing	7c02d9d82c	Merge branch 'dev'	2023-05-18 16:05:17 +08:00
wucongxing	a631c70af9	Merge branch 'dev'	2023-05-18 15:58:47 +08:00
wucongxing	496cf1b407	Merge branch 'dev'	2023-05-18 15:32:57 +08:00
wucongxing	3bac586a0f	Merge branch 'dev'	2023-05-17 14:49:41 +08:00
wucongxing	0c9755d654	Merge branch 'dev'	2023-05-17 14:36:12 +08:00
wucongxing	65ec7fba85	Merge branch 'dev'	2023-05-17 14:29:25 +08:00
wucongxing	d56f3b5a68	Merge branch 'dev'	2023-05-16 17:10:15 +08:00
wucongxing	e18fd8df22	修改医生账户	2023-05-16 14:53:40 +08:00
wucongxing	8cf5b29953	Merge branch 'dev'	2023-05-16 14:49:24 +08:00
wucongxing	1eaa0344c0	Merge branch 'dev'	2023-05-16 13:14:17 +08:00
wucongxing	46c923d74b	Merge branch 'dev'	2023-05-16 11:55:37 +08:00
wucongxing	22e09e2cc8	Merge branch 'dev'	2023-05-16 11:28:53 +08:00
wucongxing	9c7c371f1a	Merge branch 'dev'	2023-05-16 10:30:33 +08:00
wucongxing	b21a51af0c	Merge branch 'dev'	2023-05-16 10:02:35 +08:00
wucongxing	1dfcc5660f	修改im字段类型	2023-05-16 09:39:27 +08:00