Merge branch 'master' into master-test

wangrenhuang

2023-04-18 cc35e61d33b2421344bb22eb1ba50d093eacb562

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

@@ -14,6 +14,9 @@
 */
@Data
public class OrdersPHisTotalDto {

    /**必填 订单分类（OrderTotalConstants）,默认标准订单*/
    private Integer orderClassify;
    /**必填 订单类型（OrderTotalConstants）,,crm填默认project,充值就填recharge,纯商品订单填retail零售*/
    private String type;