-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
Merge pull request !1071 from heyho/master-jdk17
-
Merge pull request !1073 from 卢越/master-jdk17
-
原因：yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java中的字段：private Integer bankName实际应为String型，因为无论是用户手动输入银行名字，或是采用查询字典表类型"brokerage_bank_name"提交字典值"value"，都应该是String型。 经检查其相所有相关的DO，VO的属性bankName均为String，所以AppBrokerageWithdrawCreateReqVO的bankName改为String为宜。 Signed-off-by: heyho <heywsk@qq.com>
-
…”时，让普通用户无需成为推广者也可以绑定成为 推广者的下级以便让指定的推广者赚取佣金 Merge pull request !1068 from heyho/master-jdk17
-
Merge pull request !1070 from puhui999/develop