Commit Graph

697 Commits

Author SHA1 Message Date
f6fa92768b 党支部数量 2022-06-29 19:32:06 +08:00
1955e54d25 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 18:58:25 +08:00
f83498bede 党支部数量 2022-06-29 18:58:06 +08:00
32fa4a4e52 Merge branch 'revert-4d2dfddd' into 'uat_code'
Revert "Merge branch 'uat-userinfo' into 'uat_code'"

See merge request eshop/biz_service_ebtp_extend!92
2022-06-29 17:51:59 +08:00
bfbc7235c3 Revert "Merge branch 'uat-userinfo' into 'uat_code'"
This reverts merge request !91
2022-06-29 17:51:42 +08:00
4d2dfdddbe Merge branch 'uat-userinfo' into 'uat_code'
修改获取当前用户机制

See merge request eshop/biz_service_ebtp_extend!91
2022-06-29 16:46:34 +08:00
521efd1546 修改获取当前用户机制 2022-06-29 16:43:52 +08:00
e66b28dd32 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 15:28:16 +08:00
cd9fc38c4c 党员活动 党支部数量 2022-06-29 15:27:45 +08:00
26057004f2 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-29 10:10:17 +08:00
d316e23941 党员活动 模拟数据过滤 2022-06-29 10:09:43 +08:00
ba5126f0e6 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 17:26:38 +08:00
cd2f321662 党员活动 活动宣言判断空 2022-06-28 17:25:05 +08:00
de4c91f627 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 16:44:13 +08:00
07b1f56ea5 党员活动 模糊查询接口改body传值 2022-06-28 16:43:43 +08:00
71bfd5f582 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 15:58:39 +08:00
e28d71f140 党员活动 模糊查询接口改body传值 2022-06-28 15:58:10 +08:00
6cbc01341e Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 14:58:30 +08:00
935f7a3689 党员活动 模糊查询接口改post 2022-06-28 14:57:38 +08:00
98f6315119 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 13:39:49 +08:00
b21af4db15 党员活动 查询参数 2022-06-28 13:38:25 +08:00
4862965bb0 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 10:47:05 +08:00
50a969ee47 党员活动 联系人排序 2022-06-28 10:46:34 +08:00
776d161836 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-28 10:10:18 +08:00
4add218bea 党员活动 党支部数量 2022-06-28 10:05:07 +08:00
c3d3efdf89 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-27 17:30:43 +08:00
a30156e61b 党员活动 党支部党员数量,增加课题查询条件 2022-06-27 17:22:19 +08:00
54f00c400f Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-27 16:57:32 +08:00
ec40819d78 党员活动 风采增加二级标题 2022-06-27 16:56:41 +08:00
b806fefce4 党员活动 排序 2022-06-27 16:47:40 +08:00
94745d5ba6 党员活动 排序 2022-06-27 16:38:34 +08:00
873affcc13 Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-27 14:40:29 +08:00
96f7e76f60 党员活动 活动风采增加模糊查询 2022-06-27 14:40:00 +08:00
249bfdd49f Merge branch 'uat_partyMemberEvent' into uat_code 2022-06-27 14:32:45 +08:00
fbb8a53327 党员活动 活动风采增加模糊查询 2022-06-27 13:49:16 +08:00
66117f0191 验证码 2022-06-27 11:26:52 +08:00
8f42d1c192 验证码 2022-06-27 09:19:50 +08:00
50ec1d54cb 党员列表查询 入参改成不必传 2022-06-27 09:15:51 +08:00
d9f30cf6dd 党员活动接口 2022-06-24 15:15:36 +08:00
8e65a99d4b 党员活动接口 2022-06-23 15:06:17 +08:00
4bc7401094 党员活动接口 2022-06-22 17:37:05 +08:00
527f87ae56 党员活动类初始化 2022-06-22 14:31:23 +08:00
dba765373b Merge branch 'uat-单点跳询价' into 'master'
Uat 单点跳询价

See merge request eshop/biz_service_ebtp_extend!90
2022-06-18 00:06:46 +08:00
7d9e43153d Merge branch 'uat-单点跳询价' into 'uat'
单点登录接口

See merge request eshop/biz_service_ebtp_extend!89
2022-06-17 11:29:22 +08:00
6010d1e71d 单点登录接口 2022-06-17 11:28:11 +08:00
98394de399 Merge branch 'uat-单点跳询价' into 'uat'
单点登录接口

See merge request eshop/biz_service_ebtp_extend!88
2022-06-16 15:25:12 +08:00
dad379c1bc 单点登录接口 2022-06-16 14:52:54 +08:00
babac0e05b Merge branch 'uat-单点跳询价' into 'uat'
Uat 单点跳询价

See merge request eshop/biz_service_ebtp_extend!87
2022-06-16 08:37:55 +08:00
5551af646f 单点登录接口 2022-06-16 08:23:07 +08:00
f20c734677 Merge remote-tracking branch 'origin/master' 2022-06-15 16:41:26 +08:00