Commit Graph

4 Commits

Author SHA1 Message Date
mengkuiliang
faf39a056b Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920
# Conflicts:
#	xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
#	xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/orderevaluateinfo/OrderEvaluateInfo.java
#	xinelu-nurse-manage/src/main/resources/mapper/manage/orderevaluateinfo/OrderEvaluateInfoMapper.xml
2023-10-17 16:33:42 +08:00
纪寒
8af9f2edf8 商城相关功能代码移植 2023-10-16 15:00:16 +08:00
纪寒
333431d14a PC端-小程序商城模块移植,个人中心积分相关移植 2023-09-22 16:44:36 +08:00
纪寒
c43364003e 新增护理等服务模块 2023-09-19 18:03:34 +08:00