Commit graph

  • *
  • |\
  • | *
  • | |\
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | *
  • | | *
  • | | *
  • | | *
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | | *
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • |/ /
  • * |
  • |\ \
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\ \
  • | | | *
  • | | |/
  • | | *
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | | | *
  • | | |/
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | *
  • | * |
  • | |\|
  • 192a16c (HEAD -> master) Merge branch 'release' by wanghaoran 2023-11-30 17:26:34 +0800
  • 70ef266 (release) Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 17:13:57 +0800
  • 8044519 (refs/pull/32/head, develop) 提交领取积分代码 by wanjing 2023-11-30 17:13:36 +0800
  • 1889b70 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 16:53:28 +0800
  • 3f85aa9 (refs/pull/31/head) 提交领取积分代码 by wanjing 2023-11-30 16:53:05 +0800
  • fca6fcb Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 16:39:38 +0800
  • b3f9096 (refs/pull/30/head) 提交领取积分代码 by wanjing 2023-11-30 16:39:16 +0800
  • 6800fff Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 16:13:50 +0800
  • cbb8326 (refs/pull/29/head) 提交领取积分代码 by wanjing 2023-11-30 16:13:31 +0800
  • f2ee0f8 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 16:10:06 +0800
  • 9a399ee (refs/pull/28/head) 提交领取积分代码 by wanjing 2023-11-30 16:09:43 +0800
  • 04045dd Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 15:55:11 +0800
  • 955a5d6 (refs/pull/27/head) 提交领取积分代码 by wanjing 2023-11-30 15:54:38 +0800
  • 06c7d1b Merge branch 'release' by wanghaoran 2023-11-30 15:43:12 +0800
  • 5bce9d6 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 15:35:24 +0800
  • 6832a8b (refs/pull/26/head) 提交领取积分代码 by wanjing 2023-11-30 15:35:03 +0800
  • d79d10a Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 15:22:23 +0800
  • 2f7ce11 (refs/pull/25/head) 提交领取积分代码 by wanjing 2023-11-30 15:21:56 +0800
  • e86c343 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 15:10:44 +0800
  • 0e81282 (refs/pull/24/head) 修改领取积分代码 by wanjing 2023-11-30 15:10:18 +0800
  • 05a1487 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-30 14:58:07 +0800
  • b1e8e8c (refs/pull/23/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_qmhh into develop by wanjing 2023-11-30 13:53:13 +0800
  • e3cd96b 领取积分与每天上限做判断 by wanjing 2023-11-30 13:52:58 +0800
  • a8494be Merge branch 'develop' into release by wanghaoran 2023-11-30 09:44:16 +0800
  • 813440b 领取积分 by wanghaoran 2023-11-30 09:43:59 +0800
  • 38231ed Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by wanjing 2023-11-29 10:34:57 +0800
  • 717f6d8 (refs/pull/22/head) 修改积分明细中缺少阅读知识积分记录问题 by wanjing 2023-11-29 10:34:16 +0800
  • c8dcc1c Merge branch 'develop' into release by wanghaoran 2023-11-27 16:41:14 +0800
  • d808165 修改获取积分代码 by wanjing 2023-11-23 17:12:44 +0800
  • 4b49b5c 修改获取积分代码 by wanjing 2023-11-23 17:10:03 +0800
  • 52e1bf4 修改获取积分代码 by wanjing 2023-11-23 17:01:26 +0800
  • 3bbf0b2 提交领取积分代码 by wanjing 2023-11-23 16:17:38 +0800
  • 3d741f5 提交我要上报接口 by wanjing 2023-11-23 15:25:55 +0800
  • dd939fc 提交志愿者服务代码 by wanjing 2023-11-23 14:44:03 +0800
  • 537bf4b Merge branch 'release' by wanghaoran 2023-11-17 15:45:26 +0800
  • 764ad53 Merge branch 'develop' into release by wanghaoran 2023-11-14 09:35:38 +0800
  • c928621 立即兑换 by wanghaoran 2023-11-13 16:34:12 +0800
  • 88e44c3 立即兑换 by wanghaoran 2023-11-13 15:22:39 +0800
  • e3c37c6 我的兑换 by wanghaoran 2023-11-13 14:18:50 +0800
  • ae88d23 Merge branch 'release' by wanghaoran 2023-11-10 14:12:53 +0800
  • d62a1d8 Merge branch 'develop' into release by wanghaoran 2023-11-10 08:44:24 +0800
  • 093b957 获取商铺信息 接口 by wanghaoran 2023-11-09 15:42:08 +0800
  • 180e889 商品列表 接口 by wanghaoran 2023-11-09 14:35:30 +0800
  • 57358f6 (tag: v1.9.0) Merge branch 'release' by wanghaoran 2023-08-21 16:01:06 +0800
  • 0719267 Merge branch 'develop' into release by wanghaoran 2023-08-09 16:03:44 +0800
  • 3be8d10 修改美景提交接口 by wanghaoran 2023-08-02 17:18:12 +0800
  • edd8527 Merge branch 'release' by wanghaoran 2023-07-20 14:22:45 +0800
  • db056b5 Merge branch 'develop' into release by xiaoying 2023-07-17 10:30:38 +0800
  • 3e692ee (refs/pull/21/head) 更新短信验证相关 by xiaoying 2023-07-13 08:59:35 +0800
  • 0fc891b Merge branch 'hotfix' by wanghaoran 2023-07-12 18:24:44 +0800
  • ad5e197 (hotfix) 暂时 注释掉,发送短信功能 by wanghaoran 2023-07-12 18:24:25 +0800
  • a91e27a Merge branch 'hotfix' by wanghaoran 2023-07-12 18:16:09 +0800
  • 312ce16 打log by wanghaoran 2023-07-12 18:15:58 +0800
  • c6c6a32 Merge branch 'release' by wanghaoran 2023-07-12 15:00:44 +0800
  • da9958a Merge branch 'develop' into release by wanghaoran 2023-07-11 14:54:14 +0800
  • d3dfcd3 修改 我的兑换 by wanghaoran 2023-07-11 14:54:06 +0800
  • a3101fc Merge branch 'develop' into release by wanghaoran 2023-07-11 14:48:03 +0800
  • e80bf32 我的兑换,修改 by wanghaoran 2023-07-11 14:47:57 +0800
  • c106ae3 Merge branch 'develop' into release by wanghaoran 2023-07-11 14:40:44 +0800
  • dde2f3b 新增接口积分查询相关 参加或提交建议时发送短信验证 by xiaoying 2023-07-11 09:13:04 +0800
  • 5a08480 积分核销接口,增加商铺名称字段 by wanghaoran 2023-07-07 10:14:31 +0800
  • 90764ab Merge branch 'develop' into release by wanghaoran 2023-07-05 13:17:08 +0800
  • e08f31f 增加积分 接口 by wanghaoran 2023-07-05 13:16:58 +0800
  • 668af23 (tag: V1.8.1) Merge branch 'release' by wanghaoran 2023-07-01 15:38:19 +0800
  • 5af8dff Merge branch 'develop' into release by wanghaoran 2023-07-01 15:38:09 +0800
  • dfd67b2 去除多余校验 by wanghaoran 2023-07-01 15:38:01 +0800
  • 3e5c347 Merge branch 'release' by wanghaoran 2023-07-01 15:10:43 +0800
  • 7c577ce Merge branch 'develop' into release by wanghaoran 2023-07-01 13:47:11 +0800
  • 42dca6e 积分兑换 by wanghaoran 2023-07-01 13:47:04 +0800
  • 961adc3 Merge branch 'develop' into release by wanghaoran 2023-07-01 13:15:42 +0800
  • 464ebff 租户code by wanghaoran 2023-07-01 13:15:34 +0800
  • 0b57d4b Merge branch 'develop' into release by wanghaoran 2023-07-01 13:12:11 +0800
  • 55ebc2d 租户code by wanghaoran 2023-07-01 13:12:04 +0800
  • dcf246f Merge branch 'develop' into release by wanghaoran 2023-07-01 12:45:05 +0800
  • 8243854 unionid赋值 by wanghaoran 2023-07-01 12:44:53 +0800
  • 45c88b9 Merge branch 'develop' into release by wanghaoran 2023-06-26 11:59:23 +0800
  • 487d75c 修改WestreamUser实体类 by wanghaoran 2023-06-26 11:59:16 +0800
  • 5378548 Merge branch 'develop' into release by wanghaoran 2023-06-26 11:52:27 +0800
  • 56058e5 Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_qmhh into develop by wanghaoran 2023-06-26 10:28:47 +0800
  • 8b52574 完善查询用户积分 和 消减用户积分接口代码 by wanghaoran 2023-06-26 10:16:57 +0800
  • 6598616 三勾商城对接接口 by chenjiandong 2023-06-25 16:27:07 +0800
  • f1d50eb Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by gitadmin 2023-06-25 10:00:30 +0800
  • 4f1f9b2 (refs/pull/20/head) 三勾商城对接接口 by chenjiandong 2023-06-25 09:58:01 +0800
  • 762c614 (tag: V1.8.0) Merge branch 'release' of gitadmin/tuoheng_qmhh into master by gitadmin 2023-06-15 14:29:35 +0800
  • fba7f47 (refs/pull/19/head) Merge branch 'develop' into release by wanghaoran 2023-06-14 14:38:23 +0800
  • a70d980 修改更新视频观看进度 接口 by wanghaoran 2023-06-14 14:37:46 +0800
  • db5d738 Merge branch 'develop' into release by wanghaoran 2023-06-14 14:03:18 +0800
  • bacc0b6 打日志,2023-6-14 14:03:00 by wanghaoran 2023-06-14 14:03:10 +0800
  • 5bc4e61 Merge branch 'develop' into release by wanghaoran 2023-06-14 12:07:38 +0800
  • 369ab73 打日志 by wanghaoran 2023-06-14 12:06:28 +0800
  • c7cba7b Merge branch 'develop' into release by wanghaoran 2023-06-14 09:37:18 +0800
  • ee7d20e 修改 查询用户申请状态 接口 by wanghaoran 2023-06-14 09:37:11 +0800
  • ff757fd Merge branch 'develop' into release by wanghaoran 2023-06-14 09:26:18 +0800
  • d586e70 修改 学习视频,获取积分,更新用户表积分字段 by wanghaoran 2023-06-14 09:25:33 +0800
  • 2e77fb7 Merge branch 'develop' into release by wanghaoran 2023-06-13 17:20:36 +0800
  • b4316a8 修改观看学习视频 积分明细表入库 by wanghaoran 2023-06-13 17:19:47 +0800
  • 8ba3e3e Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by xuziqing 2023-06-13 16:44:55 +0800
  • c1b957a (refs/pull/18/head) 更新 by xiaoying 2023-06-13 16:44:14 +0800
  • e166223 添加积分对应用户 by xiaoying 2023-06-13 16:43:36 +0800
  • 2b50a05 Merge branch 'develop' of gitadmin/tuoheng_qmhh into release by xuziqing 2023-06-13 16:39:08 +0800