weiz
|
29d966699d
|
fixed
|
2023-11-01 11:24:07 +08:00 |
|
yaooo
|
1df5fe5d53
|
Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev
|
2023-10-31 16:02:50 +08:00 |
|
yaooo
|
34d9873703
|
更新语音类型
|
2023-10-31 16:02:28 +08:00 |
|
weiz
|
26117a4b58
|
Merge pull request '新增获取小组服务公司下面的所有生产队长的接口' (#147) from zhangwei into dev
Reviewed-on: #147
|
2023-10-30 15:54:54 +08:00 |
|
weiz
|
8ee1eb10ab
|
新增获取小组服务公司下面的所有生产队长的接口
|
2023-10-30 15:53:24 +08:00 |
|
weiz
|
e28a09df90
|
Merge pull request '新增获取生产队长下面的所以农户的接口' (#146) from zhangwei into dev
Reviewed-on: #146
|
2023-10-30 15:03:35 +08:00 |
|
weiz
|
076fbd6713
|
新增获取生产队长下面的所以农户的接口
|
2023-10-30 15:03:06 +08:00 |
|
weiz
|
db92550f99
|
Merge pull request '新增获取生产队长下面的所以农户的接口' (#145) from zhangwei into dev
Reviewed-on: #145
|
2023-10-30 15:01:08 +08:00 |
|
weiz
|
61c5a57f29
|
新增获取生产队长下面的所以农户的接口
|
2023-10-30 15:00:14 +08:00 |
|
|
|
f2f2210fc9
|
刷任务
|
2023-10-30 14:16:30 +08:00 |
|
chenbo
|
1d0d0f1be2
|
fixed
|
2023-10-27 09:34:08 +08:00 |
|
chenbo
|
7dd98c2b3d
|
fixed
|
2023-10-26 14:39:38 +08:00 |
|
chenbo
|
c61f3ca783
|
fixed
|
2023-10-26 13:56:50 +08:00 |
|
chenbo
|
9fbc20f3fa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-26 13:46:20 +08:00 |
|
chenbo
|
4d73a75ce6
|
fixed
|
2023-10-26 13:45:27 +08:00 |
|
weiz
|
53cccbceb5
|
Merge pull request '新增获取农户水产养殖详情接口' (#144) from zhangwei into dev
Reviewed-on: #144
|
2023-10-26 09:15:17 +08:00 |
|
weiz
|
b65c686f18
|
新增获取农户水产养殖详情接口
|
2023-10-26 09:14:28 +08:00 |
|
chenbo
|
990b752339
|
update
|
2023-10-25 17:55:18 +08:00 |
|
chenbo
|
dd9a0b5b21
|
update
|
2023-10-25 14:22:55 +08:00 |
|
chenbo
|
f29a6f525f
|
Merge branch 'dev' into preview
|
2023-10-25 11:19:47 +08:00 |
|
chenbo
|
50857f7186
|
update 前端代码
|
2023-10-25 11:19:31 +08:00 |
|
chenbo
|
068d203240
|
Merge remote-tracking branch 'origin/preview' into preview
|
2023-10-25 11:14:02 +08:00 |
|
chenbo
|
d09658305d
|
Merge branch 'dev' into preview
|
2023-10-25 11:13:18 +08:00 |
|
chenbo
|
6dd816c0b7
|
update 村联络员任务判定对接商城api统计接口
|
2023-10-25 10:53:59 +08:00 |
|
chenbo
|
9f1467ca3a
|
update 市场部长任务判定对接商城api统计接口
|
2023-10-25 10:49:38 +08:00 |
|
chenbo
|
6af8ff4f71
|
add 后台添加镇负责人任务模板
|
2023-10-25 09:46:19 +08:00 |
|
chenbo
|
02f1b63096
|
update
|
2023-10-24 14:26:19 +08:00 |
|
chenbo
|
f7dc74b3fc
|
add 商城商品列表
|
2023-10-24 13:43:35 +08:00 |
|
chenbo
|
d52a918109
|
add 商城列表
|
2023-10-24 11:23:20 +08:00 |
|
chenbo
|
6f1de215c1
|
add 村任务结算，分润,账户流水记录
|
2023-10-24 10:10:50 +08:00 |
|
chenbo
|
328aa375a9
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:04:32 +08:00 |
|
chenbo
|
8a0e4a0b4b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-24 10:04:05 +08:00 |
|
chenbo
|
cda01503f7
|
fix 村公司任务6提交接口
add 村公司任务8提交接口，当天有临时任务的话，需要上传完成任务凭证，经后台审批通过后才发放
|
2023-10-24 10:03:49 +08:00 |
|
weiz
|
1f50fa8f4d
|
Merge pull request '新增农户土地信息接口' (#143) from zhangwei into dev
Reviewed-on: #143
|
2023-10-23 17:56:56 +08:00 |
|
weiz
|
49d68f4eee
|
新增农户土地信息接口
|
2023-10-23 17:55:25 +08:00 |
|
chenbo
|
c73d2a7422
|
add 任务8自动结算
|
2023-10-23 17:53:14 +08:00 |
|
chenbo
|
73f79b6036
|
add 村联络员任务下发，结算判定，分润.无法自动判定的任务的提交和审批以及结算。
|
2023-10-23 17:31:01 +08:00 |
|
chenbo
|
3f164288ac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-23 14:21:34 +08:00 |
|
chenbo
|
d9bcd0fa27
|
update 村管理公司任务-信息平台铺设提交接口
|
2023-10-23 14:18:05 +08:00 |
|
weiz
|
d51e8bc895
|
Merge pull request '修改溯源系统请求供销系统农户信息的请求方式' (#142) from zhangwei into dev
Reviewed-on: #142
|
2023-10-23 09:33:12 +08:00 |
|
weiz
|
f6a207cb61
|
修改溯源系统请求供销系统农户信息的请求方式
|
2023-10-23 09:32:15 +08:00 |
|
weiz
|
538ca07f4b
|
Merge pull request '新增溯源系统调用的获取农户信息接口' (#141) from zhangwei into dev
Reviewed-on: #141
|
2023-10-21 17:59:56 +08:00 |
|
weiz
|
332c7ed494
|
新增溯源系统调用的获取农户信息接口
|
2023-10-21 17:58:56 +08:00 |
|
weiz
|
92b4c1355a
|
Merge pull request 'fixed' (#140) from zhangwei into dev
Reviewed-on: #140
|
2023-10-21 14:12:25 +08:00 |
|
weiz
|
5c4a77fc9c
|
fixed
|
2023-10-21 14:11:55 +08:00 |
|
weiz
|
cdf2c3eed7
|
Merge pull request 'fixed' (#139) from zhangwei into dev
Reviewed-on: #139
|
2023-10-21 14:10:14 +08:00 |
|
weiz
|
ea0ddac967
|
fixed
|
2023-10-21 14:09:42 +08:00 |
|
weiz
|
17818c0a84
|
Merge pull request 'fixed' (#138) from zhangwei into dev
Reviewed-on: #138
|
2023-10-21 13:56:29 +08:00 |
|
weiz
|
e1d6aced4c
|
fixed
|
2023-10-21 13:56:01 +08:00 |
|
weiz
|
45e2ac2e14
|
Merge pull request 'fixed' (#137) from zhangwei into dev
Reviewed-on: #137
|
2023-10-21 13:51:43 +08:00 |
|
