张恒
|
7b49958ce8
|
小程序代码订单移植
|
2023-10-16 17:32:30 +08:00 |
|
纪寒
|
343f072673
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-16 17:00:49 +08:00 |
|
纪寒
|
3b6c9994dd
|
商城相关功能代码移植
|
2023-10-16 17:00:31 +08:00 |
|
纪寒
|
8af9f2edf8
|
商城相关功能代码移植
|
2023-10-16 15:00:16 +08:00 |
|
赵旭
|
78b8f9c721
|
合并代码冲突
|
2023-10-16 14:37:56 +08:00 |
|
赵旭
|
037d6b3f66
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
# Conflicts:
# xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/mapper/ResidentPatientInfoMapper.java
# xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
|
2023-10-16 14:31:51 +08:00 |
|
赵旭
|
3bf848721f
|
注册返回绑定城市
|
2023-10-16 14:28:01 +08:00 |
|
张恒
|
138f6f1dfb
|
注册修改
|
2023-10-16 14:24:58 +08:00 |
|
HaoWang
|
4939c8b829
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-16 14:16:02 +08:00 |
|
HaoWang
|
7460db18d6
|
APP及小程序健康咨询接口
|
2023-10-16 14:15:34 +08:00 |
|
纪寒
|
fe9f8865eb
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-16 13:52:19 +08:00 |
|
纪寒
|
c8228e64d2
|
实体类和Mapper文件添加数据库新增字段
|
2023-10-16 13:52:10 +08:00 |
|
张恒
|
14055eaf2f
|
注册修改
|
2023-10-16 13:47:32 +08:00 |
|
张恒
|
11432e39d8
|
删除多余代码
|
2023-10-16 13:31:45 +08:00 |
|
赵旭
|
8b022ad013
|
Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-16 13:14:30 +08:00 |
|
李甲辉
|
f4d3bf9a3b
|
富文本图片回显
|
2023-10-16 13:08:49 +08:00 |
|
赵旭
|
049e6ac0a7
|
修改个人中心基础疾病返回值类型
|
2023-10-16 10:40:01 +08:00 |
|
mengkuiliang
|
9f4e611b0d
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-16 09:07:24 +08:00 |
|
mengkuiliang
|
611379accf
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
|
2023-10-16 09:04:00 +08:00 |
|
mengkuiliang
|
4023b7fbef
|
添加服务记录接口；
获取签约协议接口修改；
|
2023-10-16 09:03:16 +08:00 |
|
张恒
|
c99a392189
|
小程序个人中心修改
|
2023-10-13 17:21:32 +08:00 |
|
张恒
|
cdbf4e2034
|
小程序头像上传
|
2023-10-13 16:49:14 +08:00 |
|
haown
|
c1376ea982
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-13 16:01:42 +08:00 |
|
haown
|
3f0902a7da
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
Conflicts:
xinelu-admin/src/main/resources/application.yml
|
2023-10-13 15:43:18 +08:00 |
|
haown
|
a194bfc947
|
update===>:修改筛查相关接口。
|
2023-10-13 15:42:10 +08:00 |
|
赵旭
|
5adc8f6770
|
修改个人中心修改用户信息Bug
|
2023-10-13 14:16:52 +08:00 |
|
赵旭
|
c6aa56e954
|
修改小程序注册bug
|
2023-10-13 13:11:53 +08:00 |
|
赵旭
|
db302aa2ad
|
修改微信登录验证是否已注册
|
2023-10-13 10:00:38 +08:00 |
|
mengkuiliang
|
25bcc18232
|
签约申请文件上传接口优化；
|
2023-10-13 09:09:29 +08:00 |
|
mengkuiliang
|
87cd158270
|
1、添加获取家医人群、根据人群获取服务包、获取签约协议接口；
2、添加签约申请居民签字上传接口；
3、添加签约周期字段；
|
2023-10-12 17:34:47 +08:00 |
|
张恒
|
8cf706fa6e
|
小程序代码移植
|
2023-10-12 14:39:10 +08:00 |
|
张恒
|
5d0e66f568
|
小程序代码移植
|
2023-10-12 14:09:57 +08:00 |
|
赵旭
|
2f85d88146
|
新app登录、个人中心
|
2023-10-12 09:10:52 +08:00 |
|
张恒
|
3d0034ef0d
|
删除多余代码
|
2023-10-11 16:11:59 +08:00 |
|
mengkuiliang
|
76f2680694
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-11 16:09:29 +08:00 |
|
mengkuiliang
|
c21c7373b5
|
修改代码；
|
2023-10-11 16:08:54 +08:00 |
|
mengkuiliang
|
31f7740e7c
|
解决调试过程中出现的问题；
|
2023-10-11 14:29:34 +08:00 |
|
张恒
|
9247d993a9
|
删除多余代码
|
2023-10-11 11:38:32 +08:00 |
|
张恒
|
b2451f91e9
|
管理端富文本上传代码移植
|
2023-10-11 11:26:05 +08:00 |
|
张恒
|
c3d39648e8
|
Merge remote-tracking branch 'origin/dev_gy_0920' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-11 11:01:41 +08:00 |
|
张恒
|
f46aba9389
|
PC订单评价代码移植，小程序完善信息移植
|
2023-10-11 10:45:47 +08:00 |
|
张恒
|
9a50b807b8
|
字段修改
|
2023-10-10 14:48:35 +08:00 |
|
haown
|
e59814d2f6
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
|
2023-10-10 14:41:23 +08:00 |
|
mengkuiliang
|
d7e5267293
|
代码优化；
|
2023-10-10 14:40:09 +08:00 |
|
haown
|
30a2b87777
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-10 14:12:02 +08:00 |
|
haown
|
0c21bd9e3a
|
update===>:修改排班查询。
|
2023-10-10 14:09:04 +08:00 |
|
张恒
|
4789e33f2a
|
字段修改
|
2023-10-10 11:40:01 +08:00 |
|
张恒
|
6811e9638b
|
居住信息代码移植
|
2023-10-10 11:19:27 +08:00 |
|
mengkuiliang
|
151dae3aff
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/screeningproject/ScreeningProjectController.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/screeningproject/ScreeningProject.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/mapper/screeningproject/ScreeningProjectMapper.java
# xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/screeningproject/impl/ScreeningProjectServiceImpl.java
# xinelu-nurse-manage/src/main/resources/mapper/manage/screeningproject/ScreeningProjectMapper.xml
|
2023-10-10 11:17:01 +08:00 |
|
mengkuiliang
|
43b0a22561
|
1、修改获取服务预约列表接口；
2、修改其他代码；
|
2023-10-10 11:14:30 +08:00 |
|