hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 04:08:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,456 Commits 20 Branches 0 Tags
ebeb14be2f57d67636a8daba2052bb5b78dceef9
Commit Graph

4456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liuyang
d47ce54e18 fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态 2023-02-15 15:48:52 +08:00
YunaiV
333adc989f pay：示例订单，接入支付回调逻辑 2023-02-15 09:58:20 +08:00
YunaiV
4d2ebcd898 pay：前端收银台接入支付宝扫码 2023-02-15 00:11:34 +08:00
Rex
3d8d34671f Merge remote-tracking branch 'origin/master' 2023-02-14 21:33:34 +08:00
Rex
de8f8b450a 缺陷-修复代码生成器的同步报错问题 2023-02-14 21:33:13 +08:00
YunaiV
84e9c0bba0 pay：前端收银台的信息接入 2023-02-13 23:59:03 +08:00
shizhong
f8d8fdfb35 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-13 11:26:02 +08:00
YunaiV
ecbeba5da0 增加支付收银台的前端界面 2023-02-12 21:56:02 +08:00
zheng decan
5c6451f6aa fix: PostgreSQL的SQL脚本在非多租户模式下部份表tanant_id默认值缺失造成错误 2023-02-12 21:02:10 +08:00
YunaiV
7fbdfec396 增加接入示例的查询 2023-02-11 23:04:35 +08:00
YunaiV
063d5e3a8a 增加支付接入的示例 10% 2023-02-11 21:34:13 +08:00
YunaiV
1391e20e1f 更新 Spring-Boot-Labs 访问地址 2023-02-11 09:25:05 +08:00
小桂子
96282abca0 去除重复内容并更换为本地化时区 
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
 2023-02-10 17:53:46 +00:00
YunaiV
2d38a421c2 Vue3 独立到 https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-02-11 01:36:56 +08:00
小桂子
79c8fd7855 去除重复内容，并改时区为本地时区 
Signed-off-by: 小桂子 <xgzwlkj@xgzwk.com>
 2023-02-10 15:13:16 +00:00
芋道源码
9eff2038d0 !408 菜单新增 alwaysShow 总是展示、componentName 组件名 
Merge pull request !408 from 芋道源码/feature/dev-yunai
 2023-02-10 15:03:54 +00:00
YunaiV
35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 2023-02-10 23:03:10 +08:00
芋道源码
877e2376be !404 修复项目启动，链接数据查询时控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt 
Merge pull request !404 from zhang/master
 2023-02-09 23:38:46 +00:00
芋道源码
7d01d00f73 !407 fix vue3 warn 
Merge pull request !407 from xingyu/1.X-dev
 2023-02-09 23:25:16 +00:00
芋道源码
8da98f5b3d !406 update yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue. 
Merge pull request !406 from AKING/N/A
 2023-02-09 23:24:57 +00:00
xingyuv
563eb8ba90 feat: 优化post界面 2023-02-09 18:41:48 +08:00
xingyuv
a379e3a206 fix: imports 2023-02-09 18:12:26 +08:00
xingyuv
6e12fa4d78 fix: some warn 2023-02-09 15:29:29 +08:00
AKING
7fc50f186c update yudao-ui-admin-vue3/src/layout/components/TagsView/src/TagsView.vue. 
解决tagViews左右两侧按钮不能垂直居中的问题，直接使用flex，简简单单

Signed-off-by: AKING <2734339436@qq.com>
 2023-02-09 06:53:39 +00:00
xingyuv
5df6addb78 feat: 统一api风格 2023-02-09 14:47:50 +08:00
xingyuv
4923c3b163 fix: type error 2023-02-09 14:42:56 +08:00
shizhong
0709b807d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-09 11:09:40 +08:00
xingyuv
447313cb05 feat: add mp vue3 2023-02-09 10:43:29 +08:00
xingyuv
fe5f1c74a4 fix: router 2023-02-09 10:30:48 +08:00
xingyuv
cb8e92a658 feat: update deps 2023-02-09 10:23:42 +08:00
YunaiV
b7198bd373 修复 jimu 报表的样式问题 2023-02-08 21:46:00 +08:00
okill.cn
13c60e8352 修复启动项目时查询数据，控制台报错java.sql.SQLNonTransientConnectionException: Could not create connection to database server. Attempt 
Signed-off-by: okill.cn <2029364173@qq.com>
 2023-02-08 00:41:41 +08:00
YunaiV
d16d20fc22 修复 BpmTaskAssignRuleServiceImplTest 单测报错的问题 2023-02-08 00:13:34 +08:00
芋道源码
a397a57bfa !403 集成 Go-View 大屏设计器 
Merge pull request !403 from 芋道源码/feature/dev-yunai
 2023-02-07 15:09:14 +00:00
YunaiV
fb45a70bce 集成 Go-View 大屏设计器 2023-02-07 23:08:14 +08:00
YunaiV
daef663f58 修复 vue3 的后端地址填写错误 2023-02-07 22:57:50 +08:00
YunaiV
0d5daa69fb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/dev-yunai 
# Conflicts:
#	yudao-ui-admin-vue3/pnpm-lock.yaml
 2023-02-07 22:56:49 +08:00
YunaiV
1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +08:00
shizhong
2871c255e5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-06 15:01:36 +08:00
芋道源码
745d386e7f !401 修复 vue3 bpm 警告 
Merge pull request !401 from xingyu/1.X-dev
 2023-02-06 04:40:57 +00:00
xingyuv
9ab8288851 fix: error 2023-02-06 11:42:35 +08:00
xingyuv
559436dae7 chore: remove treeselect 2023-02-06 11:40:33 +08:00
xingyuv
1bb66e6783 feat: code format 2023-02-06 11:40:03 +08:00
shizhong
c0639d713f Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-02-06 11:35:34 +08:00
xingyuv
0486ec9d30 chore: update deps 2023-02-06 10:26:17 +08:00
xingyuv
aba35678bc Merge remote-tracking branch 'origin/master' into 1.X-dev 
# Conflicts:
#	yudao-ui-admin-vue3/package.json
#	yudao-ui-admin-vue3/pnpm-lock.yaml
#	yudao-ui-admin-vue3/src/main.ts
 2023-02-06 09:18:48 +08:00
芋道源码
c3f95aa9ee !399 解决操作日志记录报错的问题 
Merge pull request !399 from 麦克学IT/master
 2023-02-05 10:27:23 +00:00
yuanhang
c3836ca98b 解决操作日志记录报错的问题 
javax.validation.ConstraintViolationException: createOperateLog.arg0.name: 操作名
 2023-02-05 15:41:53 +08:00
芋道源码
5addbb23d2 !397 Vue3 工作流的预览版 
Merge pull request !397 from 芋道源码/feature/vue3-bpm
 2023-02-04 13:01:04 +00:00
YunaiV
de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
 2023-02-04 20:58:09 +08:00