Merge branch '订单添加字段' into master-test

zhouxiang

2022-12-09 0d7d7d92329e46e8bede0f0ff18cac559a977154

Merge branch '订单添加字段' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java

 phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java

@@ -31,4 +31,8 @@

    //非必填 优惠券id集合
    private List<String> userCouponIds;
    //非必填 收银员id
    private String cashier;
    //非必填 收银员门店
    private String cashierShopId;
}