ソースを参照
Merge remote-tracking branch 'origin/master'
# Conflicts: # power-fitting-JN/src/main/resources/application.yaml
# Conflicts: # power-fitting-JN/src/main/resources/application.yaml
wangb@gyee-china.com