张恒
|
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 |
|
haown
|
8082668114
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-10 11:09:10 +08:00 |
|
haown
|
fa110601b4
|
update===>:修改筛查相关文件上传。
|
2023-10-10 11:09:01 +08:00 |
|
张恒
|
945e5e8419
|
删除图片代码移植
|
2023-10-10 11:08:02 +08:00 |
|
mengkuiliang
|
7d17791ac1
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-10 09:14:10 +08:00 |
|
mengkuiliang
|
7adde383cd
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
|
2023-10-10 09:13:33 +08:00 |
|
mengkuiliang
|
96cfedc1db
|
添加服务预约相关接口；修改注册接口；
|
2023-10-10 09:13:30 +08:00 |
|
HaoWang
|
c1e79c2ba6
|
查询省级区域信息信息/根据父级区域编码查询下级区域/优化问诊信息接口
|
2023-10-10 09:09:54 +08:00 |
|
haown
|
3bcc435d29
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支
|
2023-10-09 14:35:10 +08:00 |
|
haown
|
9ba3a31af1
|
update===>:修改筛查相关接口。
|
2023-10-09 14:35:08 +08:00 |
|
张恒
|
8fe8dc82ab
|
小程序个人中心代码移植
|
2023-10-09 14:05:20 +08:00 |
|
gaoyu
|
7707af2ab7
|
设备绑定及体征检测接口
|
2023-10-09 11:18:06 +08:00 |
|
mengkuiliang
|
52ba21ab35
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
|
2023-10-09 11:14:18 +08:00 |
|
mengkuiliang
|
3927b467a5
|
添加获取家医个性服务包和筛查项目接口
|
2023-10-09 11:12:06 +08:00 |
|
张恒
|
d1c73e30d5
|
小程序个人中心代码移植
|
2023-10-09 10:40:42 +08:00 |
|
张恒
|
0c1b72c9a5
|
小程序登录移植
|
2023-10-08 17:33:19 +08:00 |
|
mengkuiliang
|
25a7771c03
|
添加服务申请相关接口；
|
2023-10-08 14:17:23 +08:00 |
|
赵旭
|
1c3fdca7d7
|
添加新app模块
|
2023-10-08 13:29:25 +08:00 |
|
mengkuiliang
|
e42bc824da
|
添加签约审核、解约审核、解约申请列表家医调用接口；
修改字段名；
|
2023-09-28 17:35:28 +08:00 |
|
mengkuiliang
|
60ac53e173
|
修改注册接口实现
|
2023-09-28 13:44:54 +08:00 |
|
mengkuiliang
|
75ef1415ad
|
Merge branch 'dev_gy_0920' of http://182.92.166.109:3000/jihan/xinelu-api into dev_gy_0920
# Conflicts:
# xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
|
2023-09-28 11:42:57 +08:00 |
|
mengkuiliang
|
29d37f02c1
|
Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
# pom.xml
# xinelu-admin/src/main/resources/application.yml
# xinelu-common/src/main/java/com/xinelu/common/utils/http/HttpUtils.java
# xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java
|
2023-09-28 11:39:38 +08:00 |
|