Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java

@@ -44,6 +44,7 @@ public class TbOrderDetail implements Serializable {
     private Integer cartId;
     private Integer placeNum;
     private String useType;
+    private String note;
 
     private static final long serialVersionUID = 1L;
 }