Merge branch 'pay' into test

cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java

@@ -3,6 +3,7 @@ package com.czg.order.dto;
 import com.czg.utils.AssertUtil;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
@@ -13,6 +14,7 @@ import java.math.BigDecimal;
  * @author ww
  */
 @Data
+@Accessors(chain = true)
 public class LtPayOtherDTO {
     /**
      * 积分商品id/团购商品id

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java

@@ -80,6 +80,7 @@ public class ShopDirectMerchant implements Serializable {
 
     private String errorMsg;
 
+    private String wechatApplyId;
     /**
      * 微信状态
      */
@@ -94,6 +95,8 @@ public class ShopDirectMerchant implements Serializable {
      */
     private String wechatSignUrl;
 
+    private String alipayOrderId;
+
     /**
      * 支付宝状态
      */

cash-common/cash-common-service/src/main/java/com/czg/system/entity/SysCategoryInfo.java

@@ -37,6 +37,10 @@ public class SysCategoryInfo implements Serializable {
     @Id(keyType = KeyType.Auto)
     private BigInteger id;
 
+    /**
+     * 一级类目code
+     */
+    private String firstCategoryCode;
     /**
      * 一级类目
      */