Merge remote-tracking branch 'origin/hph' into dev

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -1064,6 +1064,13 @@ public class OrderService {
     }
 
 
+
+
+    public Result getOrder(Integer orderId){
+      return Result.success(CodeEnum.SUCCESS, tbOrderInfoMapper.selectByPrimaryKey(orderId)) ;
+    }
+
+
     @Autowired
     TbUserInfoMapper tbUserInfoMapper;
 
@@ -1154,6 +1161,9 @@ public class OrderService {
 
 
 
+
+
+
     @Autowired
     TbOrderOutNumberMapper tbOrderOutNumberMapper;
     public Result scanSendMessage(String outNumber,String shopId){