468 Commits

Author	SHA1	Message	Date
lichuanyang	59afc49a23	token相关	2024-09-23 14:03:35 +08:00
lxd	fbd881ed14	公共方法操作时间类增加新方法 增加对外接口插入影像	2024-09-20 17:18:33 +08:00
lichuanyang	a6fd0ef154	诊断模板	2024-09-13 13:40:11 +08:00
lxd	81f3d9f2ec	机构增加dcm访问前缀和地址 以及查询方法	2024-09-12 12:20:05 +08:00
lxd	1f3b8f09a5	删除图片 以及修改 图片验证的水印文字	2024-09-11 17:15:45 +08:00
lxd	a51606ab13	影像开发获取dcm接口 修改权限	2024-09-10 14:43:24 +08:00
lxd	510581e4f5	增加首页统计数据方法	2024-08-21 18:02:07 +08:00
lxd	5b8bf7b57f	增加科室管理 增加科室字典和机构字典接口	2024-07-30 15:00:35 +08:00
lxd	1a4625c97c	完成超声模块相关内容	2024-07-19 21:15:58 +08:00
lxd	7e59d751dc	完善超声模块相关内容	2024-07-17 21:00:16 +08:00
lxd	c633781c14	创建ultrasonicCom 模块 超声组件	2024-07-15 16:35:48 +08:00
lxd	6ef2d3e97f	新增applyregistration 申请单登记相关模块	2024-07-11 11:04:04 +08:00
lxd	5720851f20	新增pacs列表查询模块	2024-07-09 20:16:30 +08:00
lxd	3a0ea58865	测试拉取提交 删除	2024-07-08 20:52:44 +08:00
lxd	d445fcc558	Merge remote-tracking branch '公司/master' ... # Conflicts: # yudao-server/src/main/resources/testview.html	2024-07-08 20:52:03 +08:00
lxd	4d9bb5164e	测试拉取提交	2024-07-08 20:51:40 +08:00
lichuanyang	251583ae79	第一次使用，仅加了个注释	2024-07-08 20:43:30 +08:00
lxd	abac0cb893	修改mysql地址密码2	2024-07-08 15:50:31 +08:00
lxd	79d02b5fdd	修改mysql地址密码	2024-07-08 15:37:44 +08:00
YunaiV	9f63e1e294	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # pom.xml # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/jmreport/core/service/JmReportTokenServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java	2024-05-04 09:39:07 +08:00
YunaiV	213a6aa0fc	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db ... # Conflicts: # yudao-server/src/main/resources/application-local.yaml	2024-05-04 09:15:58 +08:00
dhb52	774082509b	feat: 达梦DM8	2024-05-03 23:22:53 +08:00
YunaiV	29746d1459	【修复】MySQL jdbc 连接 5.7 示例不正确	2024-05-03 09:04:47 +08:00
YunaiV	6ba73e60f0	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db	2024-05-02 18:16:11 +08:00
dhb52	fd8889e76a	wip: SQLServer数据库更新, 代码生成注释乱码	2024-05-02 15:30:33 +08:00
YunaiV	ab00986a1d	Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17	2024-05-01 08:37:56 +08:00
YunaiV	c0722b3a19	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/db ... # Conflicts: # sql/mysql/ruoyi-vue-pro.sql	2024-05-01 08:05:18 +08:00
dhb52	06dacb747b	feat: Oracle数据 DDL 适配	2024-04-30 23:41:25 +08:00
dhb52	4f3aaa124c	feat: 测试数据库docker-compose, postgres DDL初稿	2024-04-29 23:41:33 +08:00
YunaiV	853db724ec	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java # yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java	2024-04-29 00:14:06 +08:00
YunaiV	cd5e6319d9	【增强】一键改包：支持 site、org 等包	2024-04-29 00:13:04 +08:00
YunaiV	da5425da2f	【修复】pay：PayWalletServiceImpl 可能存在的循环依赖问题 ... 【修复】system：dev 配置文件，缺少 WECHAT_MINI_APP 配置项~	2024-04-24 12:53:30 +08:00
YunaiV	af621cb03f	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/servlet/ServletUtils.java # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/CodegenController.java	2024-04-23 22:38:17 +08:00
YunaiV	fd832e23fd	bugfix：非 json 请求（文件上传）时，token 过期时，错误读取 request body 问题	2024-04-22 23:31:50 +08:00
YunaiV	a27c040a8f	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/errorcode/config/ErrorCodeProperties.java # yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApi.java # yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/dto/ErrorCodeAutoGenerateReqDTO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/errorcode/ErrorCodeApiImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/sensitiveword/SensitiveWordApiImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeRespVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/vo/ErrorCodeSaveReqVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/SensitiveWordController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sensitiveword/vo/SensitiveWordSaveVO.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeService.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordService.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImpl.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/errorcode/ErrorCodeServiceTest.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sensitiveword/SensitiveWordServiceImplTest.java	2024-04-22 19:56:17 +08:00
YunaiV	9a31613e5b	【移除】敏感词的管理，简化项目的复杂度	2024-04-22 19:53:01 +08:00
YunaiV	8093ef3b96	【移除】错误码的管理，简化项目的复杂度	2024-04-22 19:42:45 +08:00
YunaiV	62c6c4b9bd	同步 develop 最新代码	2024-04-12 19:17:49 +08:00
YunaiV	9cba258d8f	Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21	2024-04-12 19:14:56 +08:00
YunaiV	cc9b2e86b6	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java	2024-04-10 20:58:35 +08:00
YunaiV	2e03dcba69	移除 resilience4j 组件	2024-04-10 20:57:44 +08:00
YunaiV	9b9f54bb03	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop ... # Conflicts: # yudao-dependencies/pom.xml # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java # yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java	2024-04-05 13:32:17 +08:00
YunaiV	594eb0ccc2	全局：增加 VO 数据翻译的支持	2024-04-01 21:46:57 +08:00
YunaiV	b4e602bbd4	全局：增加 VO 数据翻译的支持	2024-04-01 12:51:45 +08:00
YunaiV	398e2a225a	Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-dependencies/pom.xml # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java	2024-04-01 12:44:59 +08:00
YunaiV	beea186507	全局：增加 VO 数据翻译的支持	2024-04-01 12:42:27 +08:00
YunaiV	dc466d2286	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ... # Conflicts: # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java # yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java # yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java	2024-03-30 20:45:11 +08:00
YunaiV	dcf6cc293e	BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差	2024-03-30 20:44:45 +08:00
YunaiV	3b379d8cc0	Merge branch 'develop' of https://gitee.com/puhui999/ruoyi-vue-pro into develop ... # Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java	2024-03-30 11:54:27 +08:00
YunaiV	907f3a58ba	Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop ... # Conflicts: # sql/mysql/ruoyi-vue-pro.sql	2024-03-28 18:53:54 +08:00