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/Channel.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CustomerController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IMerchantService.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MerchantServiceImpl.java
This commit is contained in:
zhp
2024-09-17 14:22:39 +08:00
parent 9c5090d606 eae806e1c6
commit 17c9ba5cab
14 changed files with 127 additions and 178 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/Channel.java
View File

@@ -26,8 +26,8 @@ public class Channel extends BaseEntity
@Excel(name = "渠道签名")
private String channelSign;
/** 渠道名称 */
@Excel(name = "渠道名称")
/** 渠道类型 1H5 2连登 3半流程 4全流程*/
@Excel(name = "渠道类型")
private String channelType;
/** 扣量比 */

1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Customer.java
View File

@@ -122,4 +122,5 @@ public class Customer extends BaseEntity
@Excel(name = "芝麻分")
private Integer zhiMa;
}