1、增加内容属性字典

2、优化pay钱包的余额明细查询

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/wallet/PayWalletTransactionController.java

@@ -1,5 +1,6 @@
 package com.citu.module.pay.controller.admin.wallet;
 
+import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.pay.controller.admin.wallet.vo.transaction.PayWalletTransactionPageReqVO;
@@ -36,6 +37,7 @@ public class PayWalletTransactionController {
     @PreAuthorize("@ss.hasPermission('pay:wallet:query')")
     public CommonResult<PageResult<PayWalletTransactionRespVO>> getWalletTransactionPage(
             @Valid PayWalletTransactionPageReqVO pageReqVO) {
+        pageReqVO.setUserType(UserTypeEnum.MEMBER.getValue());
         PageResult<PayWalletTransactionDO> result = payWalletTransactionService.getWalletTransactionPage(pageReqVO);
         return success(PayWalletTransactionConvert.INSTANCE.convertPage2(result));
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/bind/EnterpriseUserBindSaveReqVO.java

@@ -18,7 +18,7 @@ public class EnterpriseUserBindSaveReqVO {
     private Long enterpriseId;
 
     @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23317")
-    @NotEmpty(message = "{1_100_016_018}")
+    @NotNull(message = "{1_100_016_018}")
     private Long userId;
 
     @Schema(description = "名称", example = "x女士")

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/web/ContentStyle.java

@@ -5,10 +5,16 @@ import lombok.Data;
 @Data
 public class ContentStyle {
 
+    /** 标识 **/
+    private String mark;
+
     /** 图片地址 **/
     private String img;
 
     /** 超链接 **/
     private String link;
 
+    /** 排序 **/
+    private Integer sort;
+
 }