pages/personalCenter/certificate/index.wxml
@@ -1,6 +1,11 @@ <<<<<<< HEAD <<<<<<< HEAD ======= <!--pages/personalCenter/certificate/index.wxml--> <text>pages/personalCenter/certificate/index.wxml</text> >>>>>>> master ======= <!--pages/personalCenter/certificate/index.wxml--> <text>pages/personalCenter/certificate/index.wxml</text> >>>>>>> master
