mengkuiliang 1379142381 Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920 ... # Conflicts: # xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/orderevaluateinfo/OrderEvaluateInfoController.java		2023-10-20 10:45:51 +08:00
..
java/com/xinelu/manage	Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into dev_gy_0920	2023-10-20 10:45:51 +08:00
resources/mapper/manage	1、修改服务评价接口；	2023-10-18 17:33:58 +08:00