Merge branch 'qr_branch'

Browse Source

# Conflicts:
#	detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java
#	user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java

...

This commit is contained in:

caozehui

2025-09-03 14:27:11 +08:00

parent 8963b20dd3 4ecec5e6ef

commit a7f3925a2f

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

entrance/src/main/resources/model/PQ-COM.docx Normal file

Binary file not shown.