1812 Commits

Author SHA1 Message Date
chan
f77339f949 校验角色是否存在 2023-12-11 15:14:43 +08:00
chan
8ccaecceb9 镇合伙人任务添加校验公司是否存在任务角色用户 2023-12-11 14:23:46 +08:00
chenbo
5f1675abf4 fixed 2023-12-09 17:16:36 +08:00
chenbo
ebdfc81b16 fixed 村联络员任务-种养殖基地订单匹配 改为每日结算。新增log,记录请求商城接口返回情况。 2023-12-05 10:20:27 +08:00
chenbo
5aca95ef79 删除 提供商城查询三轮车列表接口 2023-12-04 15:54:45 +08:00
chenbo
9b534e6c32 fixed 2023-12-04 15:41:22 +08:00
chenbo
066e8c4382 fixed 2023-12-04 13:42:17 +08:00
chenbo
91e77b712c 提供商城查询三轮车列表接口 2023-12-02 19:53:38 +08:00
chenbo
7783254f1a 充值记录列表倒序排列 2023-11-30 12:41:36 +08:00
chenbo
b0058752d4 debug 充值回调 2023-11-30 12:37:40 +08:00
chenbo
d2667977f9 Revert "add 供销对接支付系统"
This reverts commit 04d478d8
2023-11-30 12:14:16 +08:00
chenbo
2f99915481 update 镇农科公司任务结算接口改为镇合伙人公司任务结算 2023-11-29 10:26:35 +08:00
chenbo
99b3c18a8e fixed 需要手动提交的任务,不需要修改任务指定人,在任务下发时已确定。 2023-11-28 10:58:32 +08:00
chenbo
89ce6e2281 fixed 修改之前关于镇农科公司任务的描述,全部改为镇合伙人 2023-11-28 10:15:25 +08:00
chenbo
cdb46846a4 fixed 镇合伙人公司任务审批 2023-11-28 09:59:28 +08:00
yaooo
ddfcb98b60 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-27 10:25:53 +08:00
yaooo
97c885e249 更新统计 2023-11-27 10:25:40 +08:00
chenbo
16423d0185 fixed 编辑入股任务回显 2023-11-25 16:10:19 +08:00
weiz
d54aa707aa Merge pull request 'update' (#175) from zhangwei into dev
Reviewed-on: #175
2023-11-25 14:34:25 +08:00
weiz
8ac05f8fa3 update 2023-11-25 14:33:41 +08:00
chenbo
995ede0dff update 更新前端代码 2023-11-25 10:20:13 +08:00
chenbo
f8bda77d0c Merge remote-tracking branch 'origin/dev' into dev 2023-11-25 10:12:36 +08:00
chenbo
7bd126f091 fixed 2023-11-25 10:10:17 +08:00
yaooo
d802ff0c75 更新小组角色 2023-11-24 14:19:26 +08:00
yaooo
93adb3d543 更新供销系统登录 2023-11-24 14:06:14 +08:00
yaooo
55aa3159ee Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-24 14:00:44 +08:00
yaooo
ad80574645 更新供销系统登录 2023-11-24 14:00:36 +08:00
chenbo
13ae414917 fixed 后台在任务运行中删除了任务模板,导致结算出现异常 2023-11-24 13:46:20 +08:00
chenbo
0c54ba8c34 fixed 后台在任务运行中删除了任务模板,导致结算出现异常 2023-11-24 11:58:58 +08:00
yaooo
0e7c4434ff 更新解析token 2023-11-24 10:56:19 +08:00
yaooo
d85687169d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-24 10:53:50 +08:00
yaooo
134765255d 更新解析token 2023-11-24 10:53:34 +08:00
chenbo
a3cdb43f1c update 镇农科公司任务改为镇合伙人公司任务 2023-11-24 10:37:22 +08:00
chenbo
6f9ef8c79f Merge remote-tracking branch 'origin/dev' into dev 2023-11-24 10:33:23 +08:00
chenbo
f327cfa298 update 镇农科公司任务改为镇合伙人公司任务 2023-11-24 10:33:11 +08:00
yaooo
9d422a2d45 新增解析中台系统token 2023-11-24 10:23:08 +08:00
chenbo
3f791f3134 update 手动下发任务相关接口 2023-11-22 15:03:18 +08:00
chenbo
759a9d4eb5 Merge branch 'dev' into preview 2023-11-22 14:05:26 +08:00
chenbo
6926465e04 Merge remote-tracking branch 'origin/dev' into dev 2023-11-22 14:04:47 +08:00
chenbo
8357942b41 update 手动下发任务相关接口 2023-11-22 14:04:30 +08:00
weiz
e419d84b60 Merge pull request '前台登录接口增加一体机极光推送设备id参数' (#173) from zhangwei into dev
Reviewed-on: #173
2023-11-22 11:03:42 +08:00
weiz
5993ecef3c 前台登录接口增加一体机极光推送设备id参数 2023-11-22 11:01:36 +08:00
chenbo
d09758fa98 add 对接支付系统,回调改造 2023-11-21 11:15:40 +08:00
chenbo
6c44af1cf0 add 对接支付系统,回调改造 2023-11-21 10:43:26 +08:00
chenbo
78b7c8ea0a add 对接支付系统,回调改造 2023-11-21 10:40:34 +08:00
chenbo
cdde963325 fixed 2023-11-21 09:09:10 +08:00
chenbo
3d249a63ae fixed 2023-11-20 19:01:21 +08:00
chenbo
959f7d642f fixed 2023-11-20 18:23:58 +08:00
chenbo
a9b29f03e8 fixed 2023-11-20 18:04:03 +08:00
chenbo
c9d14e48cb fixed 2023-11-20 17:51:18 +08:00