6 Commits

Author	SHA1	Message	Date
lyf	d557d6cb6b	Merge remote-tracking branch 'origin/master' ... # Conflicts: # .idea/workspace.xml # pluss-service-bundle/target/classes/cn/pluss/platform/baidu/impl/BaiduFaceDetectServiceImpl.class	2023-01-30 09:35:42 +08:00
lyf	b5ddf6eb9d	wap部分配置	2023-01-30 09:35:01 +08:00
zhujunshuai	20dc71421d	解决冲突	2023-01-29 14:28:01 +08:00
zhujunshuai	9a0b839abe	delete	2023-01-29 14:22:32 +08:00
lyf	c513d14203	wap部分配置	2023-01-29 10:36:30 +08:00
lyf	b017339f5f	更改配置	2023-01-28 15:57:27 +08:00