Inicio Explorar Axuda
Iniciar sesión
hexiugang
/
iamberry-common-parent
Seguir 3
Destacar 3
Fork 1
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java
#	watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl
liujiankang %!s(int64=7) %!d(string=hai) anos
pai
114d908303
achega
a5b2f27057
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      watero-rst-web/src/main/resources/platform.properties

+ 1 - 1
watero-rst-web/src/main/resources/platform.properties
Ver ficheiro 

@@ -84,4 +84,4 @@ SUCCESSINFO=SUCCESS
 
 
 #cm-website-send-msg
 
 website=https://rst.iamberry.com/QA
 
-scanningQrCode=https://w.iamberry.com/iamberry/wechat/qrCode/scanningQrCode?barCode=
 
+scanningQrCode=https://w.iamberry.com/tooth/wechat/qr/