Commit Graph

2 Commits

Author SHA1 Message Date
正新
7c5a2c858d Merge #109 into master from cc_20260420_export
feat:数量不一致

* cc_20260420_export: (7 commits squashed)

  - feat:提示修改

  - feat:提示修改

  - feat:导出调整

  - feat:管理员查询所有 非管理员权限查询

  - feat:管理员查询所有 非管理员权限查询

  - feat:fix

  - feat:数量不一致

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/109
2026-04-24 09:44:31 +00:00
正新
1bbb6f7097 Merge #98 into master from cc_20260408_trans
feat:mock 处理

* cc_20260408_trans: (22 commits squashed)

  - feat:分账

  - feat:分账接口

  - feat:分账单管理

  - feat:分账管理

  - feat:分账管理

  - feat:userIdName

  - feat:提现

  - feat:调整

  - feat:accountName

  - feat:accountName

  - feat:mock

  - feat:关联门店

  - feat:待充值待认款

  - feat:待充值待认款

  - feat:payer_account_no

  - feat:payeeAccountName

  - feat:payeeAccountNo

  - feat:page

  - feat:枚举

  - feat:接口请求方式调整get->post

  - feat:mock 处理

  - Merge branch &#39;master&#39; into cc_20260408_trans
    
    # Conflicts:
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #&#9;coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/98
2026-04-14 09:55:00 +00:00