lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-06-01 06:29:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

Browse Source
This commit is contained in:
damonyuan
2024-10-18 01:27:40 +08:00
parent 8908204792 fb91037ad2
commit d41cc4cc5b
35 changed files with 278 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/like-common/src/main/java/com/mdd/common/entity/setting/DevPayConfig.java
View File

@@ -24,7 +24,7 @@ public class DevPayConfig implements Serializable {
@TableField(exist = false)
@ApiModelProperty("显示名称")
private String showName;
private String payWayName;
@ApiModelProperty("渠道图标")
private String icon;

4
server/like-common/src/main/java/com/mdd/common/mapper/admin/AdminMapper.java
View File

@@ -22,4 +22,8 @@ public interface AdminMapper extends IBaseMapper<Admin> {
List<Admin> getByJobs(@Param("jobId") Integer jobId);
@Select("SELECT count(*) FROM la_admin admin INNER JOIN la_admin_role lad ON admin.id = lad.admin_id WHERE lad.role_id = #{roleId} AND admin.delete_time IS NULL")
Integer getCountByRoleId(@Param("roleId") Integer roleId);
}