wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master_wp' into master_zhp

Browse Source 
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
This commit is contained in:
zhp
2024-09-23 01:00:08 +08:00
parent bfb9d1c53b b7c042dd44
commit a778eac754
20 changed files with 2889 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java
View File

@@ -109,6 +109,10 @@ public class Merchant extends BaseEntity
@Excel(name = "标签")
private String label;
/** 商户是否开启二要素 0 否 1 是 */
@Excel(name = "商户是否开启二要素")
private Boolean merchantAuth;
@Excel(name = "下游渠道标识")
private String channelSign;