Merge remote-tracking branch 'origin/develop' into develop

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java

@@ -33,6 +33,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
@@ -58,6 +59,7 @@ import java.util.List;
  * @author hgw
  * @date 2022-06-20 09:55:06
  */
+@EnableConfigurationProperties({DaprUpmsProperties.class})
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/temployeeinfo")

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -61,7 +61,7 @@ import java.util.*;
  */
 @Service
 @RequiredArgsConstructor
-@EnableConfigurationProperties(DaprUpmsProperties.class)
+@EnableConfigurationProperties({DaprUpmsProperties.class,DaprCheckProperties.class})
 public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, TEmployeeInfo> implements TEmployeeInfoService {
 
 	// 缓存信息

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/DictController.java

@@ -323,7 +323,7 @@ public class DictController {
 	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.Map < java.lang.String, java.util.Map < java.lang.String, java.lang.String>>>
 	 **/
 	@Inner
-	@GetMapping("/inner/getDictToLable")
+	@GetMapping("/inner/getDictToValue")
 	public R<Map<String, Map<String, String>>> getDictToValue() {
 		return sysDictItemService.getDictToValue();
 	}