张 祥瑞
|
915580cfe0
|
Merge branch 'zxrapp' into 'master'
6.27张祥瑞
See merge request cxcxt/jeecguniapp!25
|
2025-06-27 14:55:51 +08:00 |
|
张祥瑞
|
1e1901147f
|
6.27张祥瑞
|
2025-06-27 14:55:07 +08:00 |
|
闵 年泽
|
94cf09e0e1
|
Merge branch 'minJeecg' into 'master'
1.修改健康随访
See merge request cxcxt/jeecguniapp!24
|
2025-06-27 09:17:53 +08:00 |
|
lagos
|
df6de11a0b
|
1.修改健康随访
|
2025-06-27 09:17:22 +08:00 |
|
闵 年泽
|
d64a000465
|
Merge branch 'minJeecg' into 'master'
Min jeecg
See merge request cxcxt/jeecguniapp!23
|
2025-06-27 08:37:12 +08:00 |
|
lagos
|
e852e1e997
|
Merge remote-tracking branch 'remotes/origin/master' into minJeecg
# Conflicts:
# manifest.config.ts
# src/manifest.json
|
2025-06-27 08:36:52 +08:00 |
|
lagos
|
157e5d294f
|
1.
|
2025-06-27 08:35:52 +08:00 |
|
yangzhq68909
|
c2ba2ba883
|
2.1.0 20250627
|
2025-06-27 08:29:15 +08:00 |
|
yangzhq68909
|
ac08c06a7e
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-27 08:18:37 +08:00 |
|
yangzhq68909
|
5eaac7320f
|
1
|
2025-06-27 08:18:24 +08:00 |
|
张 祥瑞
|
44c7f80124
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!22
|
2025-06-26 18:12:16 +08:00 |
|
张祥瑞
|
485978e0ed
|
6.26张祥瑞
|
2025-06-26 18:11:22 +08:00 |
|
张 祥瑞
|
70c3d23377
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!21
|
2025-06-26 16:51:26 +08:00 |
|
张祥瑞
|
e7f6f84790
|
6.26张祥瑞
|
2025-06-26 16:50:26 +08:00 |
|
yangzhq68909
|
d426f201d8
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-26 16:24:11 +08:00 |
|
yangzhq68909
|
2e8de0d60a
|
6.26
|
2025-06-26 16:22:49 +08:00 |
|
张 祥瑞
|
71c1f0812f
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!20
|
2025-06-26 16:18:37 +08:00 |
|
张祥瑞
|
dddcccc6cd
|
6.26张祥瑞
|
2025-06-26 16:17:53 +08:00 |
|
yangzhq68909
|
d2946c938a
|
1
|
2025-06-26 10:38:28 +08:00 |
|
张 祥瑞
|
22ff10e012
|
Merge branch 'zxrapp' into 'master'
6.26张祥瑞
See merge request cxcxt/jeecguniapp!19
|
2025-06-26 10:13:57 +08:00 |
|
张祥瑞
|
cd340d4185
|
6.26张祥瑞
|
2025-06-26 10:13:23 +08:00 |
|
张 祥瑞
|
72c98dba18
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!18
|
2025-06-26 09:28:46 +08:00 |
|
张祥瑞
|
58e1b25208
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-26 09:16:35 +08:00 |
|
张祥瑞
|
c979a59072
|
6.26张祥瑞
|
2025-06-26 08:38:28 +08:00 |
|
yangzhq68909
|
8ce1ebbe96
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-25 09:19:06 +08:00 |
|
yangzhq68909
|
3e4b0c1da9
|
1
|
2025-06-25 09:11:52 +08:00 |
|
yangzhq68909
|
3691d5d90f
|
健康随访表单提交
|
2025-06-25 09:07:54 +08:00 |
|
张 祥瑞
|
e1380803a5
|
Merge branch 'zxrapp' into 'master'
6.24张祥瑞
See merge request cxcxt/jeecguniapp!17
|
2025-06-24 16:53:46 +08:00 |
|
张祥瑞
|
0c5543ae73
|
6.24张祥瑞
|
2025-06-24 16:51:53 +08:00 |
|
张 祥瑞
|
9bc0f8da15
|
Merge branch 'zxrapp' into 'master'
Zxrapp
See merge request cxcxt/jeecguniapp!16
|
2025-06-23 16:28:37 +08:00 |
|
张祥瑞
|
c278e4618a
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
# src/pages-process/components/DynamicLink.vue
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-23 16:27:22 +08:00 |
|
张祥瑞
|
928959dfe0
|
6.23张祥瑞，添加制度及法律法规的审批页面
|
2025-06-23 16:19:05 +08:00 |
|
yangzhq68909
|
5726688c2e
|
1
|
2025-06-23 08:38:09 +08:00 |
|
yangzhq68909
|
72938d6407
|
三册修改
|
2025-06-20 10:51:47 +08:00 |
|
yangzhq68909
|
56427dbb19
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
|
2025-06-19 17:40:15 +08:00 |
|
yangzhq68909
|
2175a82f6c
|
1.流程审批页面增加考核实施、指标考核
|
2025-06-19 17:38:54 +08:00 |
|
闵 年泽
|
8d831a5503
|
Merge branch 'minJeecg' into 'master'
1.修改app机制
See merge request cxcxt/jeecguniapp!15
|
2025-06-17 17:35:28 +08:00 |
|
lagos
|
71b3470ca2
|
1.修改app机制
|
2025-06-17 17:34:45 +08:00 |
|
yangzhq68909
|
3801233bf0
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-16 16:17:45 +08:00 |
|
yangzhq68909
|
b535e5ad3c
|
修改判断是否有新版本方法
|
2025-06-16 16:17:33 +08:00 |
|
闵 年泽
|
c0c652e132
|
Merge branch 'minJeecg' into 'master'
1.修改模块
See merge request cxcxt/jeecguniapp!14
|
2025-06-16 11:36:06 +08:00 |
|
lagos
|
be8ca7445e
|
1.修改模块
|
2025-06-16 11:35:05 +08:00 |
|
yangzhq68909
|
b4b88b0cd7
|
2.0.2
|
2025-06-15 10:44:00 +08:00 |
|
yangzhq68909
|
c5d9e0c8b9
|
Merge remote-tracking branch 'remotes/origin/master'
# Conflicts:
# env/.env.development
# src/pages-process/components/DynamicLink.vue
# src/pages.json
# src/types/uni-pages.d.ts
|
2025-06-13 17:27:45 +08:00 |
|
yangzhq68909
|
dab30417bd
|
请假、干租车、公文发布
|
2025-06-13 16:27:09 +08:00 |
|
闵 年泽
|
fc18a672b0
|
Merge branch 'minJeecg' into 'master'
1.新增非常规模块
See merge request cxcxt/jeecguniapp!13
|
2025-06-12 12:35:19 +08:00 |
|
lagos
|
2d6bb85936
|
1.新增非常规模块
|
2025-06-12 12:34:30 +08:00 |
|
yangzhq68909
|
a6d16819e1
|
干租车审批页面
|
2025-06-09 16:04:21 +08:00 |
|
yangzhq68909
|
32360ce63a
|
Merge remote-tracking branch 'remotes/origin/master'
|
2025-06-09 11:26:10 +08:00 |
|
yangzhq68909
|
8645e1f1d6
|
1.请假领导干部不再选择审批/分管领导
|
2025-06-09 11:25:55 +08:00 |
|