1761 Commits

Author SHA1 Message Date
chenbo
4d284266fa fixed 2023-11-07 18:08:09 +08:00
chenbo
b304b24b8f Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 15:54:14 +08:00
chenbo
3ba50e9ea9 add 镇农科负责人-信息收集和促销任务 提交接口 2023-11-07 15:53:59 +08:00
yaooo
3fb014450b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-07 14:11:05 +08:00
yaooo
a754b76549 更新商机分析 2023-11-07 14:10:50 +08:00
chenbo
afcb9f6c24 add 镇农科负责人-信息收集和促销任务 提交接口 2023-11-07 11:59:32 +08:00
chenbo
cc1039465a Merge branch 'dev' into preview 2023-11-06 17:10:49 +08:00
chenbo
eb076b4953 update 村任务结算定时任务接口 2023-11-06 17:09:26 +08:00
chenbo
ca1a923965 update 2023-11-06 17:08:52 +08:00
chenbo
e7e0dd9a9b add 镇农科负责人任务-任务6,7,8结算逻辑。 任务3,4部分结算逻辑。 2023-11-06 16:47:59 +08:00
chenbo
48afda8d39 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 15:58:56 +08:00
chenbo
edfc17b274 add 镇农科负责人任务-任务6,7,8结算逻辑。 任务3,4部分结算逻辑。 2023-11-06 15:58:46 +08:00
weiz
c5193d8b78 Merge pull request '修改小组公司上级签约公司的类型判断,由镇街公司改为镇农科公司' (#152) from zhangwei into dev
Reviewed-on: #152
2023-11-06 14:25:58 +08:00
weiz
6d3cf47c71 修改小组公司上级签约公司的类型判断,由镇街公司改为镇农科公司 2023-11-06 14:25:04 +08:00
chenbo
a34a4e0bd4 add 镇农科负责人任务结算 2023-11-06 10:27:04 +08:00
yaooo
98bf3edbab Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev 2023-11-03 14:31:13 +08:00
yaooo
76b75f566d . 2023-11-03 14:30:57 +08:00
weiz
0c1766b270 Merge pull request '新增通过手机号码查找农户接口' (#151) from zhangwei into dev
Reviewed-on: #151
2023-11-02 16:43:27 +08:00
weiz
09a0ee4cc1 新增通过手机号码查找农户接口 2023-11-02 16:42:39 +08:00
weiz
fafc964faf Merge pull request '新增获取所有农户接口' (#150) from zhangwei into dev
Reviewed-on: #150
2023-11-01 16:30:15 +08:00
weiz
b188458b9b 新增获取所有农户接口 2023-11-01 16:29:15 +08:00
weiz
1b404f8429 Merge pull request 'fixed' (#149) from zhangwei into dev
Reviewed-on: #149
2023-11-01 11:29:42 +08:00
weiz
2fc2368767 fixed 2023-11-01 11:29:11 +08:00
weiz
4aff89c800 Merge pull request 'fixed' (#148) from zhangwei into dev
Reviewed-on: #148
2023-11-01 11:25:24 +08:00
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
mkm
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