TaskSystem

mkm/TaskSystem

Fork 0

Commit Graph

Select branches

Hide Pull Requests

chenbo_dev

dev

dev_1201_newpay

dev_task

dev_towntask

feature

master

master-yajin-feature

master_旧

mkm

mkm-2

preview

zhangwei

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

fec4e43438 update 小组服务团队任务-入股任务改为手动审核，线下转账 chenbo 2023-11-16 10:36:32 +08:00
e580102b5d Merge pull request 'update' (#166) from zhangwei into dev weiz 2023-11-16 09:36:11 +08:00
e8e389c78e update weiz 2023-11-16 09:35:28 +08:00
5eea9476db 更新提现管理接口 yaooo 2023-11-15 16:50:07 +08:00
9bda876532 更新提现管理接口 yaooo 2023-11-15 16:47:01 +08:00
4038608ddc Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-15 15:23:12 +08:00
31961f5727 更新提现管理接口 yaooo 2023-11-15 15:18:09 +08:00
880d4ef27a add 小组服务团队-入股任务提交 chenbo 2023-11-15 15:16:37 +08:00
1fc4748f7e 新增提醒管理接口 yaooo 2023-11-15 15:09:54 +08:00
126a836761 新增退款管理接口 yaooo 2023-11-15 15:00:32 +08:00
bac39abb5b 新增充值管理接口 yaooo 2023-11-15 14:35:26 +08:00
7761d9f08f add 小组服务团队-入股任务提交 chenbo 2023-11-15 13:50:18 +08:00
047deaa6a4 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-15 11:03:36 +08:00
16b0cd32e7 fixed chenbo 2023-11-15 11:02:33 +08:00
0c6c098c45 更新任务审批 yaooo 2023-11-14 16:35:45 +08:00
3485c47561 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-14 16:15:18 +08:00
bc8e8a42fa 更新任务审批 yaooo 2023-11-14 16:15:02 +08:00
75e81fa463 更新任务日程 yaooo 2023-11-14 15:52:25 +08:00
01289b0a12 更新任务日程 yaooo 2023-11-14 15:17:58 +08:00
e9d9367d47 更新任务状态审核 yaooo 2023-11-14 14:56:17 +08:00
00c9488f55 新增任务审批 yaooo 2023-11-14 14:51:22 +08:00
e788111ce7 更新排期 yaooo 2023-11-14 14:26:23 +08:00
2d82830a56 更新排期 yaooo 2023-11-14 14:05:22 +08:00
23059469e0 更新排期 yaooo 2023-11-14 14:04:35 +08:00
76860ba871 新增公司任务排期接口 yaooo 2023-11-14 11:22:11 +08:00
aeb98c2585 新增公司任务排期接口 yaooo 2023-11-14 11:21:53 +08:00
6dd332e699 Merge pull request '新增商户合同管理模块对外接口' (#165) from zhangwei into dev weiz 2023-11-14 10:01:40 +08:00
22e9c99d16 新增商户合同管理模块对外接口 weiz 2023-11-14 10:00:48 +08:00
de5c213172 fixed chenbo 2023-11-13 19:18:37 +08:00
9b558bb32d fixed chenbo 2023-11-13 18:49:34 +08:00
132480a46e fixed chenbo 2023-11-13 18:46:37 +08:00
ba2cbec8b7 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-13 16:38:38 +08:00
4c39f93728 fixed chenbo 2023-11-13 16:36:52 +08:00
36b06e99de Merge pull request 'fixed' (#164) from zhangwei into dev weiz 2023-11-13 15:28:48 +08:00
313caadeb7 fixed weiz 2023-11-13 15:28:11 +08:00
3b5ef1aef9 Merge pull request '新增公司合同模块对外接口' (#163) from zhangwei into dev weiz 2023-11-13 15:26:45 +08:00
b11f827cd1 新增公司合同模块对外接口 weiz 2023-11-13 15:25:50 +08:00
71896602fe Merge pull request 'zhangwei' (#162) from zhangwei into dev weiz 2023-11-13 11:50:36 +08:00
75d3818820 fixed chenbo 2023-11-13 11:50:32 +08:00
bb686752ef fixed chenbo 2023-11-13 11:48:48 +08:00
cee7211f2e fixed weiz 2023-11-13 11:46:11 +08:00
3764507e39 fixed chenbo 2023-11-13 11:24:22 +08:00
30326c94f3 新增三轮车合同管理对外接口 weiz 2023-11-13 11:12:23 +08:00
5b79502943 fixed chenbo 2023-11-13 11:06:09 +08:00
c7057e7697 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-13 10:41:57 +08:00
c293d798bd debug chenbo 2023-11-13 10:41:34 +08:00
d23a720eb2 Merge pull request '新增档案开放接口' (#161) from zhangwei into dev weiz 2023-11-11 15:38:07 +08:00
324fa8c422 新增档案开放接口 weiz 2023-11-11 15:36:10 +08:00
a59628e998 Merge pull request '新增商机分类对外接口' (#160) from zhangwei into dev weiz 2023-11-11 14:21:17 +08:00
86b17eafb5 新增商机分类对外接口 weiz 2023-11-11 14:18:21 +08:00
0d0d0a7e17 fixed 市场部长任务10接口 chenbo 2023-11-11 13:49:03 +08:00
dd880d2d0e fixed chenbo 2023-11-11 11:26:05 +08:00
dd769ef814 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-11 11:23:21 +08:00
3ae45bea91 fixed 保证金描述改为押金 chenbo 2023-11-11 11:23:13 +08:00
e94ad8deeb Merge pull request '新增商户模块对外接口' (#159) from zhangwei into dev weiz 2023-11-11 10:59:06 +08:00
53b5e4c1ee 新增商户模块对外接口 weiz 2023-11-11 10:58:26 +08:00
8b0768501b fixed 镇农科公司任务三个角色分开结算，避免某个角色的结算逻辑出现异常，导致整个镇农科公司的任务结算都终止 chenbo 2023-11-11 10:32:25 +08:00
e287c5db12 fixed 镇农科公司任务三个角色分开结算，避免某个角色的结算逻辑出现异常，导致整个镇农科公司的任务结算都终止 chenbo 2023-11-11 10:21:27 +08:00
081ace2c53 fixed chenbo 2023-11-11 09:53:23 +08:00
2ae4a48c68 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-11 09:30:03 +08:00
d5c4a0bb0a fixed chenbo 2023-11-11 09:29:52 +08:00
db2b170dff Merge pull request 'fixed' (#158) from zhangwei into dev weiz 2023-11-10 17:05:03 +08:00
664d014573 fixed weiz 2023-11-10 17:03:16 +08:00
6c38905c87 update 更新前端代码 chenbo 2023-11-10 16:45:22 +08:00
121bc09cdf Merge pull request '完成公司管理模块对外接口' (#157) from zhangwei into dev weiz 2023-11-10 16:11:00 +08:00
80696495c0 完成公司管理模块对外接口 weiz 2023-11-10 16:10:01 +08:00
52989f8e46 fixed chenbo 2023-11-10 11:45:36 +08:00
1b85e99dda Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-10 11:42:41 +08:00
0bb0c9fc90 fixed chenbo 2023-11-10 11:42:32 +08:00
b8d73e8e76 Merge pull request '新增接口签名验证' (#156) from zhangwei into dev weiz 2023-11-10 11:24:17 +08:00
fe791825d8 新增接口签名验证 weiz 2023-11-10 11:21:28 +08:00
9fb911b5fd update 更新前端代码 chenbo 2023-11-10 10:39:26 +08:00
72069c7915 update 更新前端代码 chenbo 2023-11-10 10:31:19 +08:00
6b8d91f0b4 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-09 18:52:19 +08:00
f2ce24e6a0 fixed 发送个人合同 chenbo 2023-11-09 18:52:06 +08:00
2ba37f1ebf Merge pull request '新增middleapi模块，用于中台调用数据' (#155) from zhangwei into dev weiz 2023-11-09 17:02:12 +08:00
b537209e97 新增middleapi模块，用于中台调用数据 weiz 2023-11-09 17:01:14 +08:00
9cf71dc95f Merge pull request '修改token验证接口' (#154) from zhangwei into dev weiz 2023-11-08 14:23:05 +08:00
1386e7783b 修改token验证接口 weiz 2023-11-08 14:22:43 +08:00
edbf90498a Merge pull request 'zhangwei' (#153) from zhangwei into dev weiz 2023-11-08 14:14:09 +08:00
dc9356c42f 增加token验证接口 weiz 2023-11-08 14:13:50 +08:00
848061d20f 增加token验证接口 weiz 2023-11-08 14:11:40 +08:00
64768d3302 update 任务3结算 chenbo 2023-11-08 13:58:06 +08:00
ee78dc4a7d update 任务3结算 chenbo 2023-11-07 18:42:24 +08:00
0c36e8dbc0 update 任务3结算 chenbo 2023-11-07 18:29:54 +08:00
5869879e93 update 更新前端代码 chenbo 2023-11-07 18:27:07 +08:00
9d3ec12d9e fixed chenbo 2023-11-07 18:08:38 +08:00
4d284266fa fixed chenbo 2023-11-07 18:08:09 +08:00
b304b24b8f Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-07 15:54:14 +08:00
3ba50e9ea9 add 镇农科负责人-信息收集和促销任务提交接口 chenbo 2023-11-07 15:53:59 +08:00
3fb014450b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/TaskSystem into dev yaooo 2023-11-07 14:11:05 +08:00
a754b76549 更新商机分析 yaooo 2023-11-07 14:10:50 +08:00
afcb9f6c24 add 镇农科负责人-信息收集和促销任务提交接口 chenbo 2023-11-07 11:59:32 +08:00
cc1039465a Merge branch 'dev' into preview chenbo 2023-11-06 17:10:49 +08:00
eb076b4953 update 村任务结算定时任务接口 chenbo 2023-11-06 17:09:26 +08:00
ca1a923965 update chenbo 2023-11-06 17:08:52 +08:00
e7e0dd9a9b add 镇农科负责人任务-任务6,7,8结算逻辑。任务3,4部分结算逻辑。 chenbo 2023-11-06 16:47:59 +08:00
48afda8d39 Merge remote-tracking branch 'origin/dev' into dev chenbo 2023-11-06 15:58:56 +08:00
edfc17b274 add 镇农科负责人任务-任务6,7,8结算逻辑。任务3,4部分结算逻辑。 chenbo 2023-11-06 15:58:46 +08:00
c5193d8b78 Merge pull request '修改小组公司上级签约公司的类型判断，由镇街公司改为镇农科公司' (#152) from zhangwei into dev weiz 2023-11-06 14:25:58 +08:00