suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-03 16:51:16 +08:00
parent f73a9f04f0 b111d1dfe7
commit 6be08c9770
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -8,7 +8,6 @@
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="mobile" jdbcType="VARCHAR" property="mobile"/>
<result column="email" jdbcType="VARCHAR" property="email"/>
<result column="org_email" jdbcType="VARCHAR" property="orgEmail"/>
<result column="main_admin" jdbcType="BIT" property="mainAdmin"/>
<result column="is_admin" jdbcType="BIT" property="isAdmin"/>
<result column="unionid" jdbcType="VARCHAR" property="unionid"/>
@@ -25,7 +24,7 @@
<result column="user_region_ids" jdbcType="LONGVARCHAR" property="userRegionIds"/>
</resultMap>
<sql id="Base_Column_List">
id, user_id, name, remark, mobile, email, org_email, main_admin, is_admin, unionid,
id, user_id, name, remark, mobile, email, main_admin, is_admin, unionid,
avatar, jobnumber, is_leader, is_leader_in_depts, face_url, user_status, create_time,
third_oa_unique_flag
</sql>

3
coolstore-partner-model/src/main/java/com/cool/store/entity/EnterpriseUserDO.java
View File

@@ -36,9 +36,6 @@ public class EnterpriseUserDO implements Serializable {
@ApiModelProperty("员工的电子邮箱")
private String email;
@ApiModelProperty("员工的企业邮箱")
private String orgEmail;
@ApiModelProperty("是否是主管理员，0：否，1：是")
private Boolean mainAdmin;

3
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -1,6 +1,5 @@
#mysql config
default.datasource.url=jdbc:mysql://store10-coolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.url=jdbc:mysql://store10-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT