chenbo
|
3ae45bea91
|
fixed 保证金描述改为押金
|
2023-11-11 11:23:13 +08:00 |
|
weiz
|
e94ad8deeb
|
Merge pull request '新增商户模块对外接口' (#159) from zhangwei into dev
Reviewed-on: #159
|
2023-11-11 10:59:06 +08:00 |
|
weiz
|
53b5e4c1ee
|
新增商户模块对外接口
|
2023-11-11 10:58:26 +08:00 |
|
chenbo
|
8b0768501b
|
fixed 镇农科公司任务三个角色分开结算，避免某个角色的结算逻辑出现异常，导致整个镇农科公司的任务结算都终止
|
2023-11-11 10:32:25 +08:00 |
|
chenbo
|
e287c5db12
|
fixed 镇农科公司任务三个角色分开结算，避免某个角色的结算逻辑出现异常，导致整个镇农科公司的任务结算都终止
|
2023-11-11 10:21:27 +08:00 |
|
chenbo
|
081ace2c53
|
fixed
|
2023-11-11 09:53:23 +08:00 |
|
chenbo
|
2ae4a48c68
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-11 09:30:03 +08:00 |
|
chenbo
|
d5c4a0bb0a
|
fixed
|
2023-11-11 09:29:52 +08:00 |
|
weiz
|
db2b170dff
|
Merge pull request 'fixed' (#158) from zhangwei into dev
Reviewed-on: #158
|
2023-11-10 17:05:03 +08:00 |
|
weiz
|
664d014573
|
fixed
|
2023-11-10 17:03:16 +08:00 |
|
chenbo
|
6c38905c87
|
update 更新前端代码
|
2023-11-10 16:45:22 +08:00 |
|
weiz
|
121bc09cdf
|
Merge pull request '完成公司管理模块对外接口' (#157) from zhangwei into dev
Reviewed-on: #157
|
2023-11-10 16:11:00 +08:00 |
|
weiz
|
80696495c0
|
完成公司管理模块对外接口
|
2023-11-10 16:10:01 +08:00 |
|
chenbo
|
52989f8e46
|
fixed
|
2023-11-10 11:45:36 +08:00 |
|
chenbo
|
1b85e99dda
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-10 11:42:41 +08:00 |
|
chenbo
|
0bb0c9fc90
|
fixed
|
2023-11-10 11:42:32 +08:00 |
|
weiz
|
b8d73e8e76
|
Merge pull request '新增接口签名验证' (#156) from zhangwei into dev
Reviewed-on: #156
|
2023-11-10 11:24:17 +08:00 |
|
weiz
|
fe791825d8
|
新增接口签名验证
|
2023-11-10 11:21:28 +08:00 |
|
chenbo
|
9fb911b5fd
|
update 更新前端代码
|
2023-11-10 10:39:26 +08:00 |
|
chenbo
|
72069c7915
|
update 更新前端代码
|
2023-11-10 10:31:19 +08:00 |
|
chenbo
|
6b8d91f0b4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-11-09 18:52:19 +08:00 |
|
chenbo
|
f2ce24e6a0
|
fixed 发送个人合同
|
2023-11-09 18:52:06 +08:00 |
|
weiz
|
2ba37f1ebf
|
Merge pull request '新增middleapi模块，用于中台调用数据' (#155) from zhangwei into dev
Reviewed-on: #155
|
2023-11-09 17:02:12 +08:00 |
|
weiz
|
b537209e97
|
新增middleapi模块，用于中台调用数据
|
2023-11-09 17:01:14 +08:00 |
|
weiz
|
9cf71dc95f
|
Merge pull request '修改token验证接口' (#154) from zhangwei into dev
Reviewed-on: #154
|
2023-11-08 14:23:05 +08:00 |
|
weiz
|
1386e7783b
|
修改token验证接口
|
2023-11-08 14:22:43 +08:00 |
|
weiz
|
edbf90498a
|
Merge pull request 'zhangwei' (#153) from zhangwei into dev
Reviewed-on: #153
|
2023-11-08 14:14:09 +08:00 |
|
weiz
|
dc9356c42f
|
增加token验证接口
|
2023-11-08 14:13:50 +08:00 |
|
weiz
|
848061d20f
|
增加token验证接口
|
2023-11-08 14:11:40 +08:00 |
|
chenbo
|
64768d3302
|
update 任务3结算
|
2023-11-08 13:58:06 +08:00 |
|
chenbo
|
ee78dc4a7d
|
update 任务3结算
|
2023-11-07 18:42:24 +08:00 |
|
chenbo
|
0c36e8dbc0
|
update 任务3结算
|
2023-11-07 18:29:54 +08:00 |
|
chenbo
|
5869879e93
|
update 更新前端代码
|
2023-11-07 18:27:07 +08:00 |
|
chenbo
|
9d3ec12d9e
|
fixed
|
2023-11-07 18:08:38 +08:00 |
|
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 |
|