Commit Graph

11 Commits (757f51a2dd1104b56e27c7d9752dc307b7488fd6)

Author SHA1 Message Date
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
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
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 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
liuyunhu 3a4ddc8f2e 虎,车辆模块优化、mq模块测试,无法传输参数,数据到达交换机就停了 2024-03-29 22:32:16 +08:00
YuanYh 2f74b536d9 管理企业更新 2024-03-29 21:52:04 +08:00
YuanYh c00d4c8904 管理企业 2024-03-28 22:33:31 +08:00
DongZeLiang 847e150cbc 企业管理,伪代码 2024-03-28 17:31:30 +08:00
lijiayao 68ced79707 style: 代码初始化 2024-03-26 19:18:33 +08:00