Commit Graph

91 Commits (deece927c5e2e926b74bdf3da39de1b500339ed2)

Author SHA1 Message Date
liuyunhu 9419a2f0a6 11 2024-04-05 19:01:11 +08:00
dongxiaodong 71f1bc84e2 判断异常 2024-04-05 18:01:10 +08:00
dongxiaodong 371c80d110 判断异常 2024-04-05 11:37:29 +08:00
ffr 4a6124d181 upd commit 2024-04-05 10:10:12 +08:00
ffr 73546a7a5a Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
2024-04-05 08:54:23 +08:00
dongxiaodong 976f35f212 Merge branch 'server_five_xiaoyao' into server_five_dongxiaodong
# Conflicts:
#	couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml
2024-04-05 08:40:48 +08:00
dongxiaodong f81f05ae1c 判断异常 2024-04-05 08:38:19 +08:00
lijiayao 9e489bd4ec feat: 事件系统 2024-04-05 08:36:56 +08:00
lijiayao ed31af73b5 Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
2024-04-04 15:05:23 +08:00
lijiayao 041aaa4654 feat: 事件系统 2024-04-04 15:04:25 +08:00
dongxiaodong 846073f528 删除没用的文件 2024-04-04 14:45:07 +08:00
ffr 0c71aec748 车辆管理 2024-04-04 14:37:20 +08:00
lijiayao 9e8106ab46 refactor: 修改框架 2024-04-04 09:48:53 +08:00
liuyunhu 562deda30a 修改远程调用 配置,有的变量没改导致调用不通 2024-04-04 09:43:08 +08:00
liuyunhu f07dc734e4 远程调用 加自动配置扫描 2024-04-04 08:50:19 +08:00
lijiayao 0c1cfb8f28 refactor: 修改框架 2024-04-03 11:27:17 +08:00
lijiayao 2352def47e refactor: 修改框架 2024-04-03 11:01:11 +08:00
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
ffr f9ec95317c Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_fufanrui 2024-04-02 10:59:00 +08:00
ffr fa79d7a83b 员工管理 2024-04-01 21:19:21 +08:00
lijiayao 313fd4aa54 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
2024-04-01 19:49:39 +08:00
dongxiaodong b17a7104e0 Merge branch 'server_five' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five_dongxiaodong
# Conflicts:
#	couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
2024-03-31 15:03:41 +08:00
dongxiaodong 77045a3977 3/28Dxd提交2 2024-03-31 15:01:17 +08:00
lijiayao 1910013cbb Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao
# Conflicts:
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java
2024-03-31 10:22:47 +08:00
lijiayao b8e3b4dcd1 feat: 新增、删除 2024-03-31 10:21:50 +08:00
ffr 2b392ec1d1 管理企业 2024-03-31 10:17:59 +08:00
YuanYh 9b683e6129 管理企业更新 2024-03-31 10:12:18 +08:00
ffr 24c219c145 更新代码 2024-03-30 09:50:19 +08:00
lijiayao 09c28eb1fb Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-file/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-job/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-03-30 00:42:31 +08:00
lijiayao 089068a745 Merge remote-tracking branch 'origin/server_five_yuanyonghao' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-file/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-job/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
#	couplet-modules/pom.xml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-03-30 00:42:05 +08:00
lijiayao 3303cfd0b3 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
#	couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java
#	pom.xml
2024-03-30 00:40:16 +08:00
lijiayao 96f9bc50f1 实现业务功能 2024-03-30 00:38:42 +08:00
liuyunhu 3a4ddc8f2e 虎,车辆模块优化、mq模块测试,无法传输参数,数据到达交换机就停了 2024-03-29 22:32:16 +08:00
YuanYh 2f74b536d9 管理企业更新 2024-03-29 21:52:04 +08:00
dongxiaodong f26476a526 Merge branch 'server_five' into server_five_dongxiaodong 2024-03-29 09:05:20 +08:00
dongxiaodong 9b649d2e60 3/28Dxd提交2 2024-03-28 23:34:52 +08:00
lijiayao 5ce8944c51 Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao 2024-03-28 22:39:44 +08:00
YuanYh c00d4c8904 管理企业 2024-03-28 22:33:31 +08:00
dongxiaodong 5f6bffff35 3/28Dxd提交 2024-03-28 22:30:33 +08:00
DongZeLiang 847e150cbc 企业管理,伪代码 2024-03-28 17:31:30 +08:00
lijiayao 68ced79707 style: 代码初始化 2024-03-26 19:18:33 +08:00