933 Commits

Author SHA1 Message Date
2857f0e4ee 查询过滤 2022-07-15 15:49:25 +08:00
eec1202338 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-15 14:59:22 +08:00
89c1824c6d 查询过滤 2022-07-15 14:58:59 +08:00
d1d51c5850 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-15 10:00:02 +08:00
807d280762 修改排序 2022-07-15 09:59:38 +08:00
a3142bfcf3 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 16:17:26 +08:00
8743da85fb 修改排序 2022-07-14 16:16:39 +08:00
feba281453 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 15:54:57 +08:00
a9593a9493 修改排序 2022-07-14 15:54:16 +08:00
5b46de5b06 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-14 15:23:16 +08:00
855a1dbb8a 修改接口参数 2022-07-14 15:22:01 +08:00
6ab07f7db0 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-13 14:13:30 +08:00
84e4e81ccd 表合并 2022-07-13 14:12:58 +08:00
8f5726aa55 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-13 13:47:00 +08:00
da0e440379 表合并 2022-07-13 13:46:32 +08:00
7ba8f2fa8d Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-13 13:34:53 +08:00
adc7847af8 表合并 2022-07-13 11:34:53 +08:00
d845aab84e Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-13 09:45:12 +08:00
8d911d4c33 后台接口 2022-07-13 09:44:43 +08:00
9335be85f8 后台程序 2022-07-12 23:36:49 +08:00
de010e9822 增加图片id字段 2022-07-12 17:31:31 +08:00
99a1a78388 后台程序 2022-07-11 23:28:11 +08:00
44bc992594 Merge branch 'uat_partyMemberEvent' into 'master'
Uat party member event

See merge request eshop/biz_service_ebtp_extend!110
2022-07-08 21:25:54 +08:00
f021186be4 Merge branch 'uat_partyMemberEvent' into uat 2022-07-08 21:20:41 +08:00
2488255859 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-08 16:13:16 +08:00
cadd2785ac 提意见增加公司名 2022-07-08 16:12:45 +08:00
5c5fba8713 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-07 14:30:36 +08:00
ad82983e67 党员活动 所属党支部 2022-07-07 14:30:12 +08:00
cef9a78d05 Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志

See merge request eshop/biz_service_ebtp_extend!109
2022-07-07 14:12:38 +08:00
4700c8e9e9 增加日志 2022-07-07 14:11:28 +08:00
f3b35c2ad8 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-07 08:44:58 +08:00
f3fe12a8ea 党员活动 文档中心获取地址 2022-07-07 08:44:33 +08:00
14882423cc Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 17:06:58 +08:00
cc69c73b78 党员活动 文档中心获取地址 2022-07-06 17:06:34 +08:00
130c851ff9 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 16:46:37 +08:00
2f58710bce 党员活动 文档中心获取地址 2022-07-06 16:46:13 +08:00
c1516d30f2 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 16:39:54 +08:00
750abad4c8 党员活动 文档中心获取地址 2022-07-06 16:39:35 +08:00
56e7da9a8d Merge branch 'uat_partyMemberEvent' into uat_code
# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java
2022-07-06 16:22:17 +08:00
65d77640b5 党员活动 文档中心获取地址 2022-07-06 16:21:24 +08:00
c4a4e77a74 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 15:47:11 +08:00
1fa9dbb7cf 党员活动 根据党支部名称查询 2022-07-06 15:46:51 +08:00
2b9324210c 党员活动 根据党支部名称查询 2022-07-06 14:40:06 +08:00
6fd3805568 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 14:29:10 +08:00
ce49b21258 党员活动 2022-07-06 14:28:49 +08:00
1453d2fb54 Merge branch 'uat_partyMemberEvent' into uat_code 2022-07-06 14:13:32 +08:00
8d379f6a0f 党员活动 2022-07-06 14:11:50 +08:00
102026a99b Merge branch 'uat_保证金天擎调用' into 'uat_code'
增加日志

See merge request eshop/biz_service_ebtp_extend!108
2022-07-05 08:52:58 +08:00
ae0319e548 增加日志 2022-07-05 08:51:30 +08:00
f6147e5362 Merge branch 'uat_partyMemberEvent' 2022-07-01 17:02:46 +08:00