1791 Commits

Author SHA1 Message Date
mkm
e467fe0a58 Merge pull request '修复合同' (#15) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/15
2023-08-03 11:40:05 +08:00
mkm
89d8ca50ae 修复合同 2023-08-03 11:38:58 +08:00
mkm
906cf3dfb9 Merge pull request '更新公司移动段api签定' (#14) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/14
2023-08-03 11:27:25 +08:00
mkm
7d85cc2423 更新公司移动段api签定 2023-08-03 11:27:03 +08:00
mkm
9250aa2e1c Merge pull request '更新区域字段' (#13) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/13
2023-08-03 10:19:28 +08:00
mkm
1f2affbe07 更新区域字段 2023-08-03 10:19:11 +08:00
mkm
217826ef36 Merge pull request '更新api' (#12) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/12
2023-08-03 10:16:15 +08:00
mkm
caa504e7dd 更新api 2023-08-03 10:15:51 +08:00
mkm
fa95a753cb 更新api接口 2023-08-02 23:13:05 +08:00
mkm
627e690ead Merge pull request '字典列表' (#11) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/11
2023-08-02 17:12:18 +08:00
mkm
97465fcc7d 字典列表 2023-08-02 17:11:30 +08:00
wei1990
a671cb8449 Merge pull request 'zhangwei' (#10) from zhangwei into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/10
新增资产管理模型文件
2023-08-02 16:53:39 +08:00
f82b4c4462 新增资产管理模型文件 2023-08-02 16:50:31 +08:00
b9affdbb9d 新增资产管理 2023-08-02 16:43:39 +08:00
058cbe6d7a qMerge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem into zhangwei 2023-08-02 16:42:35 +08:00
mkm
431c81dcaf Merge pull request '前端合同生成' (#9) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/9
2023-08-02 15:59:48 +08:00
mkm
d8bc3150f2 前端合同生成 2023-08-02 15:59:14 +08:00
2364e18d69 qMerge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem into zhangwei 2023-08-02 15:53:49 +08:00
mkm
dbf47eaf13 Merge pull request 'mkm' (#8) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/8
2023-08-02 15:05:52 +08:00
mkm
772d76477a 更新商机 2023-08-02 15:05:21 +08:00
mkm
54bd214e55 Merge branch 'mkm' of http://git.excellentkk.cn/mkm/TaskSystem into mkm 2023-08-02 14:34:01 +08:00
mkm
6eda1fdbff 更新是否小队长接口 (#7)
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/7
2023-08-02 14:29:49 +08:00
mkm
f3864c5c5b 更新是否小队长接口 2023-08-02 14:25:08 +08:00
mkm
a27f263e31 Merge pull request '更新' (#6) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/6
2023-08-02 13:55:09 +08:00
mkm
7f985283ad 更新 2023-08-02 13:54:41 +08:00
mkm
4978cc581c Merge pull request '修复字段' (#5) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/5
2023-08-02 11:52:10 +08:00
mkm
b51340de51 修复字段 2023-08-02 11:51:49 +08:00
mkm
4bc389d838 Merge pull request '修复字段' (#4) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/4
2023-08-02 11:39:29 +08:00
mkm
1cb2652fdb 修复字段 2023-08-02 11:39:12 +08:00
0b9f761bd3 mMerge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem into zhangwei 2023-08-02 11:08:06 +08:00
mkm
e8113ba91b Merge pull request 'mkm' (#3) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/3
2023-08-02 10:51:28 +08:00
mkm
b622cb9cb4 合同发起和队长判断 2023-08-02 10:50:50 +08:00
e06d54bcd5 aaMerge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem into zhangwei 2023-08-02 09:53:27 +08:00
mkm
0657c7cdc6 Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem into mkm 2023-08-02 09:50:05 +08:00
mkm
73a2679ae5 Merge pull request 'Merge pull request 'mkm' (#1) from mkm into master' (#2) from master into mkm
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/2
2023-08-02 09:31:22 +08:00
mkm
1832bc7ff9 更新 2023-08-01 22:24:25 +08:00
78a4ba2bb5 init 2023-08-01 17:57:08 +08:00
mkm
58d17e6755 Merge pull request 'mkm' (#1) from mkm into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/1
2023-08-01 17:29:31 +08:00
mkm
37c8312350 提交 2023-08-01 17:28:38 +08:00
mkm
81104a8d67 更新 2023-08-01 17:19:30 +08:00
mkm
aa8fa7c139 修复village_code 2023-08-01 15:43:42 +08:00
mkm
e7a22cd49a 更新档案文件 2023-08-01 15:41:14 +08:00
mkm
09a53cc867 更新数组 2023-08-01 14:51:11 +08:00
mkm
5de2b425cd 更新倒序 2023-08-01 14:39:27 +08:00
mkm
b75544dbf0 更新 2023-08-01 14:37:06 +08:00
mkm
8fe5490b74 修改标识 2023-08-01 14:10:06 +08:00
mkm
53c90bcda5 更新children 2023-08-01 13:55:29 +08:00
mkm
ad96862375 上传接口 2023-08-01 13:41:36 +08:00
mkm
66ad185083 Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem
Conflicts:
	app/adminapi/logic/user/UserLogic.php
2023-08-01 11:05:00 +08:00
mkm
25c3aff88c 更新 2023-08-01 11:02:40 +08:00